diff --git a/scripts/pgit.sh b/scripts/pgit.sh index 183559f4..14c5cb51 100644 --- a/scripts/pgit.sh +++ b/scripts/pgit.sh @@ -180,12 +180,7 @@ clone() } run_git -C $p fetch --prune --recurse-submodules=on-demand $remotename $fromref if [ "$toref" ]; then - curref=`git -C $p branch --show-current` - if [ "$curref" = "$toref" ]; then - run_git -C $p pull --recurse-submodules=on-demand $remotename $fromref - else - run_git -C $p fetch --recurse-submodules=on-demand $remotename $fromref:$toref - fi + run_git -C $p merge --ff-only $remotename/$fromref $toref fi else # set -x