From 0df50c415d1e2a9f38fb372b04ee7254daff5684 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 7 Dec 2016 08:05:50 +0000 Subject: [PATCH] pgit.sh: Ongoing additions Signed-off-by: Jan Lindemann --- scripts/pgit.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/pgit.sh b/scripts/pgit.sh index 25031bdc..956e28b0 100644 --- a/scripts/pgit.sh +++ b/scripts/pgit.sh @@ -79,11 +79,10 @@ clone() else if [ -d $p ]; then git -C $p remote | grep -q "^$fromuser$" || { - git -C $p remote add $fromuser - git -C $p remote set-url --fetch $fromuser $pullurl + git -C $p remote add $fromuser $pullurl git -C $p remote set-url --push $fromuser no_push } - git -C $p pull $fromuser + git -C $p pull $fromuser master else set -x git clone ssh://$login@git.jannet.de/srv/git/$fromuser/proj/$p @@ -91,7 +90,6 @@ clone() git -C $p remote set-url --push $fromuser no_push $git_srv_admin -u $login -j create-personal-project $p git -C $p remote add origin $pushurl - git -C $p fetch origin master git -C $p push origin master git -C $p branch --set-upstream-to origin/master master set +x