]> git.madduck.net Git - code/vcsh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

vcsh: Initial support for cloning from branches other than master
authorRichard Hartmann <richih@debian.org>
Sat, 7 Sep 2013 11:34:23 +0000 (13:34 +0200)
committerDridi Boukelmoune <dridi.boukelmoune@gmail.com>
Wed, 22 Oct 2014 14:15:31 +0000 (16:15 +0200)
vcsh

diff --git a/vcsh b/vcsh
index e8513edbac9ce3bf7fea283e84185a7940ee5920..86a3711ddab7ae189a2560495e63d04a489d4aeb 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -146,9 +146,9 @@ clone() {
        hook pre-clone
        init
        git remote add origin "$GIT_REMOTE"
        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
                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
        [ 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
        hook post-merge
        hook post-clone
        retire