Code

Don't yap about merge-subtree during make
authorShawn O. Pearce <spearce@spearce.org>
Thu, 12 Apr 2007 05:21:18 +0000 (01:21 -0400)
committerJunio C Hamano <junkio@cox.net>
Fri, 13 Apr 2007 00:43:28 +0000 (17:43 -0700)
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>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Makefile

index a77d31de989f6de63bb2fbbd5ccef3c1c83352a8..d6c5d596b82d0af46539eb069d1633e19c64221d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -728,7 +728,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 $@