From: Peter Amstutz <peter.amstutz@curii.com>
Date: Sun, 26 Jun 2022 23:32:52 +0000 (-0400)
Subject: 18870: git stuff
X-Git-Tag: 2.5.0~127^2~22
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/fc3e2c30b85c138fdbdf440f4f29f5f710de2814

18870: git stuff

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index 604bd7e325..37f1baf20e 100755
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -77,8 +77,10 @@ case "$subcmd" in
 	    else
 		if ! ssh $NODE test -d arvados-setup ; then
 		    ssh $NODE git init --bare arvados-setup.git
-		    git remote add $NODE $DEPLOY_USER@$NODE:arvados-setup.git
-		    git push $NODE
+		    if ! git remote add $NODE $DEPLOY_USER@$NODE:arvados-setup.git ; then
+			git remote set-url $NODE $DEPLOY_USER@$NODE:arvados-setup.git
+		    fi
+		    git push $NODE master
 		    ssh $NODE git clone arvados-setup.git arvados-setup
 		fi