From 00a52c9039e89e847757dc2088591279b27e2fbb Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 3 Jan 2019 12:10:00 +0000 Subject: [PATCH] pgit.sh: Don't pull fetchuser into current master, only fetch Signed-off-by: Jan Lindemann --- scripts/pgit.sh | 2 +- scripts/pkg.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/pgit.sh b/scripts/pgit.sh index 2d75b6b9..bc7a44f6 100644 --- a/scripts/pgit.sh +++ b/scripts/pgit.sh @@ -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 pull $remotename master + run_git -C $p fetch $remotename master else # set -x run_git clone ssh://$login@git.janware.com/srv/git/$fromuser/proj/$p diff --git a/scripts/pkg.sh b/scripts/pkg.sh index 63bf2617..3cdb6be3 100644 --- a/scripts/pkg.sh +++ b/scripts/pkg.sh @@ -584,7 +584,7 @@ upload_pkg() [janware-debian] fqdn = $server # login = - incoming = /srv/ftp/pub/packages/all/debian/mini-dinstall/incoming/ + incoming = /srv/dav/pub/packages/jw-foss/debian/mini-dinstall/incoming/ method = rsync hash = sha allow_unsigned_uploads = yes