From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 4 Oct 2010 13:05:47 +0000 (+0200)
Subject: fix pushurl handling
X-Git-Tag: xonotic-v0.1.0preview~150
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8259e681c172d33f6ecc0df026aa89b9c79430d2;p=xonotic%2Fxonotic.git

fix pushurl handling
---

diff --git a/all b/all
index 5812b82f..c53631dc 100755
--- a/all
+++ b/all
@@ -299,6 +299,13 @@ fix_upstream_rebase_mergefail()
 
 fix_git_config()
 {
+	verbose git config remote.origin.url "$1"
+	if [ -n "$2" ]; then
+		verbose git config remote.origin.pushurl "$2"
+	else
+		verbose git config --unset remote.origin.pushurl || true
+	fi
+	verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
 	verbose git config core.autocrlf input
 	if [ -z "`git config push.default`" ]; then
 		verbose git config push.default current # or is tracking better?
@@ -340,14 +347,7 @@ case "$cmd" in
 			if [ -d "$d0/$d" ]; then
 				if $allow_pull; then
 					enter "$d0/$d" verbose
-					fix_git_config
-					verbose git config remote.origin.url "$url"
-					if [ -n "$pushurl" ]; then
-						verbose git config remote.origin.pushurl "$pushurl"
-					else
-						verbose git config --unset remote.origin.pushurl
-					fi
-					verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+					fix_git_config "$url" "$pushurl"
 					r=`git symbolic-ref HEAD`
 					r=${r#refs/heads/}
 					if git config branch.$r.remote >/dev/null 2>&1; then
@@ -370,12 +370,7 @@ case "$cmd" in
 			else
 				verbose git clone "$url" "$d0/$d"
 				enter "$d0/$d" verbose
-				if [ -n "$pushurl" ]; then
-					verbose git config remote.origin.pushurl "$pushurl"
-				else
-					verbose git config --unset remote.origin.pushurl
-				fi
-				fix_git_config
+				fix_git_config "$url" "$pushurl"
 				if [ "$branch" != "master" ]; then
 					verbose git checkout --track -b "$branch" origin/"$branch"
 				fi