]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
./all branch: fetch origin before creating a branch, to make sure new branches start...
authorRudolf Polzer <divverent@alientrap.org>
Sun, 23 May 2010 12:12:54 +0000 (14:12 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 23 May 2010 12:12:54 +0000 (14:12 +0200)
all

diff --git a/all b/all
index 935a58ae0c8327034a5b39b25b736688c4f65913..38b65d5c062991b625271569c48fbe43ef624b8e 100755 (executable)
--- a/all
+++ b/all
@@ -302,7 +302,8 @@ case "$cmd" in
                                                if [ -n "$srcbranch" ]; then
                                                        b=$srcbranch
                                                else
                                                if [ -n "$srcbranch" ]; then
                                                        b=$srcbranch
                                                else
-                                                       b="`repobranch "$d"`"
+                                                       b=origin/"`repobranch "$d"`"
+                                                       verbose git fetch origin || true
                                                fi
                                                # TODO do this without pushing
                                                verbose git push "$remote" "$b":"$branch"
                                                fi
                                                # TODO do this without pushing
                                                verbose git push "$remote" "$b":"$branch"