X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/53311ba2f69d55b2148866c40148dbbfaee8c761..21030a7f325e0496deb8084c768a74d2ad9ea15c:/vcsh diff --git a/vcsh b/vcsh index e8513ed..edb91fa 100755 --- a/vcsh +++ b/vcsh @@ -146,9 +146,10 @@ 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" + git checkout -b $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 +163,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/"$VCSH_BRANCH" hook post-merge hook post-clone retire