From 7aecff0797f9d282587544b356b105c05f13da21 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Sun, 26 Jun 2022 19:29:43 -0400 Subject: [PATCH] 18870: tweaking git stuff Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- tools/salt-install/installer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh index a943fff6a7..604bd7e325 100755 --- a/tools/salt-install/installer.sh +++ b/tools/salt-install/installer.sh @@ -67,7 +67,7 @@ case "$subcmd" in set -x git add -A - if ! git diff --exit-code ; then + if ! git diff --cached --exit-code ; then git commit -m"prepare for deploy" fi for NODE in "${!NODES[@]}" @@ -75,7 +75,7 @@ case "$subcmd" in if test $NODE = localhost ; then sudo ./provision.sh --config local.params --roles ${NODES[$NODE]} else - if ! ssh $NODE test -d arvados-setup.git ; then + 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 -- 2.30.2