{"thread":{"id":"5783","subject":"[PATCH] Stop making git-merge-recur","startedAt":"2006-10-02T02:45:06Z","lastAt":"2006-10-02T04:52:58Z","messageCount":4,"participants":["A Large Angry SCM","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"28095","messageId":"45207D32.8040300@gmail.com","threadId":"5783","inReplyTo":null,"subject":"[PATCH] Stop making git-merge-recur","fromName":"A Large Angry SCM","fromEmail":"gitzilla@gmail.com","sentAt":"2006-10-02T02:45:06Z","receivedAt":"2006-10-02T02:45:06Z","isPatch":true,"sender":{"key":"gitzilla@gmail.com","avatar":"https://gravatar.com/avatar/354625c442439908ff3dd99757dee330e29e9df7847472384faf7a00add247fb?d=mp&s=160"},"body":"Git-merge-recur is no longer installed and make clean no longer\nremoves it, so creating making it.\n\n\nSigned-off-by: A Large Angry SCM <gitzilla@gmail.com>\n---\n\n Makefile |    8 ++------\n 1 files changed, 2 insertions(+), 6 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex dd33158..37bd59d 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -586,8 +586,7 @@ export prefix TAR INSTALL DESTDIR SHELL_\n \n ### Build rules\n \n-all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi \\\n-\tgit-merge-recur$X\n+all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi\n \n all: perl/Makefile\n \t$(MAKE) -C perl\n@@ -603,9 +602,6 @@ git$X: git.c common-cmds.h $(BUILTIN_OBJ\n \n help.o: common-cmds.h\n \n-git-merge-recur$X: git-merge-recursive$X\n-\trm -f $@ && ln git-merge-recursive$X $@\n-\n $(BUILT_INS): git$X\n \trm -f $@ && ln git$X $@\n \n@@ -918,7 +914,7 @@ check-docs::\n \tdo \\\n \t\tcase \"$$v\" in \\\n \t\tgit-merge-octopus | git-merge-ours | git-merge-recursive | \\\n-\t\tgit-merge-resolve | git-merge-stupid | git-merge-recur | \\\n+\t\tgit-merge-resolve | git-merge-stupid | \\\n \t\tgit-merge-recursive-old | \\\n \t\tgit-ssh-pull | git-ssh-push ) continue ;; \\\n \t\tesac ; \\\n"},{"id":"28096","messageId":"45207E47.8080107@gmail.com","threadId":"5783","inReplyTo":"45207D32.8040300@gmail.com","subject":"Re: [PATCH] Stop making git-merge-recur","fromName":"A Large Angry SCM","fromEmail":"gitzilla@gmail.com","sentAt":"2006-10-02T02:49:43Z","receivedAt":"2006-10-02T02:49:43Z","isPatch":true,"sender":{"key":"gitzilla@gmail.com","avatar":"https://gravatar.com/avatar/354625c442439908ff3dd99757dee330e29e9df7847472384faf7a00add247fb?d=mp&s=160"},"body":"A Large Angry SCM wrote:\n> Git-merge-recur is no longer installed and make clean no longer\n> removes it, so creating making it.\n              ^^^^^^^^^^^^^^^^^^\nShould be \"so stop creating\" it.\n"},{"id":"28098","messageId":"7vu02nz5w6.fsf@assigned-by-dhcp.cox.net","threadId":"5783","inReplyTo":"45207D32.8040300@gmail.com","subject":"Re: [PATCH] Stop making git-merge-recur","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-10-02T04:41:13Z","receivedAt":"2006-10-02T04:41:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"A Large Angry SCM <gitzilla@gmail.com> writes:\n\n> Git-merge-recur is no longer installed and make clean no longer\n> removes it, so creating making it.\n\nThanks for noticing.\n\nThe bug is actually not installing nor cleaning it.  People who\nwanted to stay on the bleeding edge could add \"-s recur\" on the\ncommand line, or have \"merge.twohead = recur\" in the config;\nthis is what we actually encouraged people for wider testing.\nWe do not suddenly break them.  I planned the removal for the\nrelease after 1.4.3.\n\nThis should fix it -- could you eyeball it please?\n\n-- >8 --\nMakefile: install and clean merge-recur, still.\n\nWe advertised git-merge-recur for some time, and we planned to\nsupport it for one release after we made it the 'recursive'.\nHowever we forgot to install it nor have \"make clean\" clean it.\n\nSigned-off-by: Junio C Hamano <junkio@cox.net>\n---\n\ndiff --git a/Makefile b/Makefile\nindex dd33158..401b893 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -215,7 +215,8 @@ BUILT_INS = \\\n \t$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))\n \n # what 'all' will build and 'install' will install, in gitexecdir\n-ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)\n+ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS) \\\n+\tgit-merge-recur$X\n \n # Backward compatibility -- to be removed after 1.0\n PROGRAMS += git-ssh-pull$X git-ssh-push$X\n@@ -586,8 +587,7 @@ export prefix TAR INSTALL DESTDIR SHELL_\n \n ### Build rules\n \n-all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi \\\n-\tgit-merge-recur$X\n+all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi\n \n all: perl/Makefile\n \t$(MAKE) -C perl\n"},{"id":"28099","messageId":"45209B2A.8070900@gmail.com","threadId":"5783","inReplyTo":"7vu02nz5w6.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] Stop making git-merge-recur","fromName":"A Large Angry SCM","fromEmail":"gitzilla@gmail.com","sentAt":"2006-10-02T04:52:58Z","receivedAt":"2006-10-02T04:52:58Z","isPatch":true,"sender":{"key":"gitzilla@gmail.com","avatar":"https://gravatar.com/avatar/354625c442439908ff3dd99757dee330e29e9df7847472384faf7a00add247fb?d=mp&s=160"},"body":"Junio C Hamano wrote:\n> A Large Angry SCM <gitzilla@gmail.com> writes:\n> \n>> Git-merge-recur is no longer installed and make clean no longer\n>> removes it, so creating making it.\n> \n> Thanks for noticing.\n> \n> The bug is actually not installing nor cleaning it.  People who\n> wanted to stay on the bleeding edge could add \"-s recur\" on the\n> command line, or have \"merge.twohead = recur\" in the config;\n> this is what we actually encouraged people for wider testing.\n> We do not suddenly break them.  I planned the removal for the\n> release after 1.4.3.\n> \n> This should fix it -- could you eyeball it please?\n\n+1\n"}]}