fix another bug in the script ;)
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 23 Nov 2010 09:24:23 +0000 (10:24 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 23 Nov 2010 09:24:23 +0000 (10:24 +0100)
all

diff --git a/all b/all
index 1b29784dc4e9e5d8f22276ddf534a92b5ac516e9..c912afa02533670096b8e41374c105e2bb3a738f 100755 (executable)
--- a/all
+++ b/all
@@ -275,6 +275,7 @@ fix_upstream_rebase()
        r_r=${r_r#refs/heads/}
        r_rem=`git config "branch.$r_rem.remote" || $ECHO origin`
        r_bra=`git config "branch.$r_bra.merge" || $ECHO "$r_r"`
        r_r=${r_r#refs/heads/}
        r_rem=`git config "branch.$r_rem.remote" || $ECHO origin`
        r_bra=`git config "branch.$r_bra.merge" || $ECHO "$r_r"`
+       r_bra=${r_bra#refs/heads/}
        if [ x"$r_me" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
                if [ x"$r_other" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
                        return
        if [ x"$r_me" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
                if [ x"$r_other" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
                        return