From db6bdc454ec96240f81da86a31f917bf43a4ca96 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 9 Oct 2019 15:16:25 +0000 Subject: [PATCH] scm.sh + pgit.sh: Add on-demand to recurse-submodules git pull, push, fetch use --recurse-submodules, which is non-optional for push. Added --recurse-submodules=on-demand to all for consistency. Signed-off-by: Jan Lindemann --- scripts/pgit.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/pgit.sh b/scripts/pgit.sh index 452ebb79..40ccf30a 100644 --- a/scripts/pgit.sh +++ b/scripts/pgit.sh @@ -126,7 +126,7 @@ clone() fat_marker "Fetching project $p from user $fromuser" if [ "$fromuser" = "$login" ]; then if [ -d $p ]; then - run_git -C $p pull --recurse-submodules + run_git -C $p pull --recurse-submodules=on-demand else run_git clone ssh://$login@git.janware.com/srv/git/$fromuser/proj/$p fi @@ -138,7 +138,7 @@ clone() run_git -C $p remote add $remotename $pullurl run_git -C $p remote set-url --push $remotename no_push } - run_git -C $p fetch --recurse-submodules $remotename master + run_git -C $p fetch --recurse-submodules=on-demand $remotename master else # set -x run_git clone ssh://$login@git.janware.com/srv/git/$fromuser/proj/$p @@ -146,7 +146,7 @@ clone() run_git -C $p remote set-url --push $remotename no_push $git_srv_admin -u $login -j create-personal-project $p run_git -C $p remote add origin $pushurl - run_git -C $p push --recurse-submodules origin master + run_git -C $p push --recurse-submodules=on-demand origin master $git_srv_admin -u $login -j update-descriptions $p run_git -C $p branch --set-upstream-to origin/master master # set +x