# [PATCH] Stop making git-merge-recur 4 messages from 2006-10-02 to 2006-10-02. Participants: A Large Angry SCM, Junio C Hamano. Thread: https://gitlist.dev/t/5783 ## A Large Angry SCM, 2006-10-02 02:45 Subject: [PATCH] Stop making git-merge-recur Message-ID: <45207D32.8040300@gmail.com> URL: https://gitlist.dev/e/45207D32.8040300%40gmail.com ``` Git-merge-recur is no longer installed and make clean no longer removes it, so creating making it. Signed-off-by: A Large Angry SCM --- Makefile | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index dd33158..37bd59d 100644 --- a/Makefile +++ b/Makefile @@ -586,8 +586,7 @@ export prefix TAR INSTALL DESTDIR SHELL_ ### Build rules -all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi \ - git-merge-recur$X +all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi all: perl/Makefile $(MAKE) -C perl @@ -603,9 +602,6 @@ git$X: git.c common-cmds.h $(BUILTIN_OBJ help.o: common-cmds.h -git-merge-recur$X: git-merge-recursive$X - rm -f $@ && ln git-merge-recursive$X $@ - $(BUILT_INS): git$X rm -f $@ && ln git$X $@ @@ -918,7 +914,7 @@ check-docs:: do \ case "$$v" in \ git-merge-octopus | git-merge-ours | git-merge-recursive | \ - git-merge-resolve | git-merge-stupid | git-merge-recur | \ + git-merge-resolve | git-merge-stupid | \ git-merge-recursive-old | \ git-ssh-pull | git-ssh-push ) continue ;; \ esac ; \ ``` ## A Large Angry SCM, 2006-10-02 02:49 Subject: Re: [PATCH] Stop making git-merge-recur Message-ID: <45207E47.8080107@gmail.com> URL: https://gitlist.dev/e/45207E47.8080107%40gmail.com In-Reply-To: <45207D32.8040300@gmail.com> ``` A Large Angry SCM wrote: > Git-merge-recur is no longer installed and make clean no longer > removes it, so creating making it. ^^^^^^^^^^^^^^^^^^ Should be "so stop creating" it. ``` ## Junio C Hamano, 2006-10-02 04:41 Subject: Re: [PATCH] Stop making git-merge-recur Message-ID: <7vu02nz5w6.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vu02nz5w6.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <45207D32.8040300@gmail.com> ``` A Large Angry SCM writes: > Git-merge-recur is no longer installed and make clean no longer > removes it, so creating making it. Thanks for noticing. The bug is actually not installing nor cleaning it. People who wanted to stay on the bleeding edge could add "-s recur" on the command line, or have "merge.twohead = recur" in the config; this is what we actually encouraged people for wider testing. We do not suddenly break them. I planned the removal for the release after 1.4.3. This should fix it -- could you eyeball it please? -- >8 -- Makefile: install and clean merge-recur, still. We advertised git-merge-recur for some time, and we planned to support it for one release after we made it the 'recursive'. However we forgot to install it nor have "make clean" clean it. Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index dd33158..401b893 100644 --- a/Makefile +++ b/Makefile @@ -215,7 +215,8 @@ BUILT_INS = \ $(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS)) # what 'all' will build and 'install' will install, in gitexecdir -ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS) +ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS) \ + git-merge-recur$X # Backward compatibility -- to be removed after 1.0 PROGRAMS += git-ssh-pull$X git-ssh-push$X @@ -586,8 +587,7 @@ export prefix TAR INSTALL DESTDIR SHELL_ ### Build rules -all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi \ - git-merge-recur$X +all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi all: perl/Makefile $(MAKE) -C perl ``` ## A Large Angry SCM, 2006-10-02 04:52 Subject: Re: [PATCH] Stop making git-merge-recur Message-ID: <45209B2A.8070900@gmail.com> URL: https://gitlist.dev/e/45209B2A.8070900%40gmail.com In-Reply-To: <7vu02nz5w6.fsf@assigned-by-dhcp.cox.net> ``` Junio C Hamano wrote: > A Large Angry SCM writes: > >> Git-merge-recur is no longer installed and make clean no longer >> removes it, so creating making it. > > Thanks for noticing. > > The bug is actually not installing nor cleaning it. People who > wanted to stay on the bleeding edge could add "-s recur" on the > command line, or have "merge.twohead = recur" in the config; > this is what we actually encouraged people for wider testing. > We do not suddenly break them. I planned the removal for the > release after 1.4.3. > > This should fix it -- could you eyeball it please? +1 ```