X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=a8354da815d338b035d995c4fc5b0e1ed45c001f;hp=9480f29f64ab5508a1095ecc7cdc0bdd6101b18a;hb=6bd227f5ac40d506bddd844555a6bc10300f2a7b;hpb=fd646e5c630f566fb54fbacf07e224ea2916176f 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