We will use merge in "update-nopull", so don't do merge here, which would just merge the remote HEAD, possibly leading to conflicts that would need to be resolved manually, only to afterwards check out (or rather, now merge) an older version as part of the bootstrap procedure. Instead, only update the remote here. We also do not use "git fetch", as the current branch might not have the Gambit upstream branch as it's remote, but rely on $(REMOTE) instead.
*NOTE*: the code for Mercurial is not updated because of lack of knowledge of that system by the author of this patch. --- makefile.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/makefile.in b/makefile.in index f331eaa..39019e5 100644 --- a/makefile.in +++ b/makefile.in @@ -145,8 +145,7 @@ push: fake_target
pull: fake_target @if test "$(RC)" = "$(GIT)"; then \ - $(GIT) pull && \ - $(GIT) fetch --tags; \ + $(GIT) remote update $(REMOTE); \ else \ $(HG) pull; \ fi