threads / patch / 7623

patchDon't yap about merge-subtree during make

Subject: [PATCH] Don't yap about merge-subtree during make

## tl;dr

2 messages between Apr 12, 2007 and Apr 12, 2007. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

Shawn O. Pearce· Apr 12, 2007, 05:21 UTC · lore

By default we are pretty quiet about the actual commands that
we are running.  So we should continue to be quiet about the new
merge-subtree hardlink to merge-recursive.  Technically this is not
a builtin, but it is close because subtree is actually builtin to
a non-builtin.  So lets just make things easy and call it a builtin.
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to Makefile +1 −1

diff --git a/Makefile b/Makefile
index 2b34dd8..cb28d7a 100644
--- a/Makefile
+++ b/Makefile
@@ -729,7 +729,7 @@ git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS) GIT-CFLAGS
 help.o: common-cmds.h
 
 git-merge-subtree$X: git-merge-recursive$X
-	rm -f $@ && ln git-merge-recursive$X $@
+	$(QUIET_BUILT_IN)rm -f $@ && ln git-merge-recursive$X $@
 
 $(BUILT_INS): git$X
 	$(QUIET_BUILT_IN)rm -f $@ && ln git$X $@

-- 
1.5.1.1.772.gab9f7

Shawn O. Pearce· Apr 12, 2007, 05:49 UTC · re: Shawn O. Pearce · lore

Re: [PATCH] Don't yap about merge-subtree during make

"Shawn O. Pearce" <spearce@spearce.org> wrote:

Show 5 quoted lines

> By default we are pretty quiet about the actual commands that
> we are running.  So we should continue to be quiet about the new
> merge-subtree hardlink to merge-recursive.  Technically this is not
> a builtin, but it is close because subtree is actually builtin to
> a non-builtin.  So lets just make things easy and call it a builtin.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Such a quick short patch, I forgot -s...  ;-)

-- 
Shawn.