From 6bd227f5ac40d506bddd844555a6bc10300f2a7b Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 9 Jul 2010 22:54:58 +0200 Subject: [PATCH] properly identify upstream --- all | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/all b/all index 9480f29f..a8354da8 100755 --- 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 -- 2.39.2