From 8f53cfb08e4d2ac1491dd8f2cfe4db2734064dd5 Mon Sep 17 00:00:00 2001 From: Richard Hartmann Date: Sat, 7 Sep 2013 13:34:23 +0200 Subject: [PATCH] vcsh: Initial support for cloning from branches other than master --- vcsh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vcsh b/vcsh index e8513ed..86a3711 100755 --- a/vcsh +++ b/vcsh @@ -146,9 +146,9 @@ clone() { hook pre-clone init git remote add origin "$GIT_REMOTE" - git config branch.master.remote origin - git config branch.master.merge refs/heads/master - if [ $(git ls-remote origin master 2> /dev/null | wc -l ) -lt 1 ]; then + git config branch."$VCSH_BRANCH".remote origin + git config branch."$VCSH_BRANCH".merge refs/heads/$VCSH_BRANCH + if [ $(git ls-remote origin $VCSH_BRANCH 2> /dev/null | wc -l ) -lt 1 ]; then info "remote is empty, not merging anything" exit fi @@ -162,7 +162,7 @@ clone() { [ x"$VCSH_CONFLICT" = x'1' ]) && fatal "will stop after fetching and not try to merge! Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17 - git merge origin/master + git merge origin/master # XXX hook post-merge hook post-clone retire -- 2.39.2