X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=bb0fa4833923a3cd08bd995cde7e5a42e2169db4;hp=2489f5aa991a9e202816c0053b4bff0fc656bd3c;hb=f217d0db491385cbf8e5e0ee2446d8222f0d5883;hpb=bfe3e801b04693bbe695332e38a23afc543be844 diff --git a/all b/all index 2489f5aa..bb0fa483 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