]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
try fixing ./all branch
authorRudolf Polzer <divverent@alientrap.org>
Sun, 23 May 2010 12:51:44 +0000 (14:51 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 23 May 2010 12:51:44 +0000 (14:51 +0200)
all

diff --git a/all b/all
index 38b65d5c062991b625271569c48fbe43ef624b8e..6cdb5032a283474f6445e9ed3a2046a2bf10e709 100755 (executable)
--- a/all
+++ b/all
@@ -306,8 +306,10 @@ case "$cmd" in
                                                        verbose git fetch origin || true
                                                fi
                                                # TODO do this without pushing
-                                               verbose git push "$remote" "$b":"$branch"
-                                               verbose git checkout --track -b "$branch" "$remote/$branch"
+                                               verbose git checkout -b "$branch" "$b"
+                                               verbose git config "branch.$branch.remote" "$remote"
+                                               verbose git config "branch.$branch.merge" "refs/heads/$b"
+                                               verbose git push origin "$branch"
                                        fi
                                fi
                                cd "$d0"