]> git.pld-linux.org Git - packages/rpm-build-tools.git/commitdiff
Fix checkout of new tracking branches
authorKacper Kornet <draenog@pld-linux.org>
Thu, 31 Mar 2011 13:13:28 +0000 (14:13 +0100)
committerKacper Kornet <draenog@pld-linux.org>
Thu, 31 Mar 2011 13:13:28 +0000 (14:13 +0100)
With git checkout "$CVSTAG" -- a new tracking branch is not created if
only remote branch origin/$CVSTAG exist.

builder.sh

index dac478d43ba526b87a79f9a2bce74ee9ae2afa16..2a200600b4f48c09f13ba64c2c981a4a76075a65 100755 (executable)
@@ -777,7 +777,7 @@ get_spec() {
        fi
 
        if [ -n "$CVSTAG" ]; then
-               git checkout "$CVSTAG" -- || exit
+               git checkout "$CVSTAG" -- 2>/dev/null || git checkout -t "origin/$CVSTAG" > /dev/null || exit
                git symbolic-ref -q HEAD > /dev/null &&
                        git merge '@{u}'
        fi
This page took 0.052617 seconds and 4 git commands to generate.