diff --git a/scripts/pgit.sh b/scripts/pgit.sh index 855519a2..72a1e10f 100644 --- a/scripts/pgit.sh +++ b/scripts/pgit.sh @@ -1,4 +1,4 @@ -###!/bin/sh +#!/bin/sh log() { @@ -168,7 +168,7 @@ clone() if [ "$fromuser" = "$login" ]; then if [ -d $p ]; then run_git -C $p pull --recurse-submodules=on-demand - run_git -C $p submodule foreach --recursive 'git fetch --tags -f' + run_git -C $p submodule foreach --recursive 'git fetch --tags -f origin' else run_clone $remote_base/$fromuser$remote_subpath/$p $p fi @@ -180,7 +180,7 @@ clone() run_git -C $p remote set-url --push $remotename no_push } run_git -C $p fetch --prune --recurse-submodules=on-demand $remotename $fromref - run_git -C $p submodule foreach --recursive 'git fetch --tags -f' + run_git -C $p submodule foreach --recursive 'git fetch --tags -f origin' if [ "$toref" ]; then run_git -C $p merge --ff-only $remotename/$fromref $toref fi