[gambit-list] [PATCH 4/6] makefile.in: "merge $(REMOTE)" instead of "checkout master"

Christian Jaeger chrjae at gmail.com
Fri Apr 30 10:54:17 EDT 2010


The following assumptions are not true (anymore):

 - because of the "change git pull back to fetch in "pull" rule" patch,
   the previously active branch is not merged with upstream anymore;
   we do this here instead;

 - the master branch might not be the branch that the user is working
   on locally; blindingly checking out "master" will only derange the
   working directory

 *NOTE*: the code for Mercurial is not updated because of lack of
knowledge of that system by the author of this patch.
---
 makefile.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/makefile.in b/makefile.in
index 39019e5..30002c0 100644
--- a/makefile.in
+++ b/makefile.in
@@ -158,7 +158,7 @@ update-nopull: fake_target
 	fi; \
 	if test "$$next_version" = ""; then \
 	  if test "$(RC)" = "$(GIT)"; then \
-	    $(GIT) checkout master; \
+	    $(GIT) merge $(REMOTE)/master; \
 	  else \
 	    $(HG) checkout; \
 	  fi; \
-- 
1.7.0.3




More information about the Gambit-list mailing list