{"thread":{"id":"7623","subject":"[PATCH] Don't yap about merge-subtree during make","startedAt":"2007-04-12T05:21:18Z","lastAt":"2007-04-12T05:49:33Z","messageCount":2,"participants":["Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"39200","messageId":"20070412052118.GA13119@spearce.org","threadId":"7623","inReplyTo":null,"subject":"[PATCH] Don't yap about merge-subtree during make","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-04-12T05:21:18Z","receivedAt":"2007-04-12T05:21:18Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"By default we are pretty quiet about the actual commands that\nwe are running.  So we should continue to be quiet about the new\nmerge-subtree hardlink to merge-recursive.  Technically this is not\na builtin, but it is close because subtree is actually builtin to\na non-builtin.  So lets just make things easy and call it a builtin.\n---\n Makefile |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 2b34dd8..cb28d7a 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -729,7 +729,7 @@ git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS) GIT-CFLAGS\n help.o: common-cmds.h\n \n git-merge-subtree$X: git-merge-recursive$X\n-\trm -f $@ && ln git-merge-recursive$X $@\n+\t$(QUIET_BUILT_IN)rm -f $@ && ln git-merge-recursive$X $@\n \n $(BUILT_INS): git$X\n \t$(QUIET_BUILT_IN)rm -f $@ && ln git$X $@\n-- \n1.5.1.1.772.gab9f7\n"},{"id":"39202","messageId":"20070412054933.GB12979@spearce.org","threadId":"7623","inReplyTo":"20070412052118.GA13119@spearce.org","subject":"Re: [PATCH] Don't yap about merge-subtree during make","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-04-12T05:49:33Z","receivedAt":"2007-04-12T05:49:33Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"\"Shawn O. Pearce\" <spearce@spearce.org> wrote:\n> By default we are pretty quiet about the actual commands that\n> we are running.  So we should continue to be quiet about the new\n> merge-subtree hardlink to merge-recursive.  Technically this is not\n> a builtin, but it is close because subtree is actually builtin to\n> a non-builtin.  So lets just make things easy and call it a builtin.\n\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n\n\nSuch a quick short patch, I forgot -s...  ;-)\n\n-- \nShawn.\n"}]}