properly identify upstream
authorRudolf Polzer <divverent@alientrap.org>
Fri, 9 Jul 2010 20:54:58 +0000 (22:54 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 9 Jul 2010 20:54:58 +0000 (22:54 +0200)
all

diff --git a/all b/all
index 9480f29f64ab5508a1095ecc7cdc0bdd6101b18a..a8354da815d338b035d995c4fc5b0e1ed45c001f 100755 (executable)
--- a/all
+++ b/all
@@ -398,7 +398,7 @@ case "$cmd" in
                        fi
                        rem=`git config "branch.$r.remote" || echo origin`
                        bra=`git config "branch.$r.merge" || echo "$r"`
-                       upstream="$rem/$bra"
+                       upstream="$rem/${bra#refs/heads/}"
                        if ! git rev-parse "$upstream" >/dev/null 2>&1; then
                                upstream="origin/`repobranch "$d"`"
                        fi