@matheusbsbs / matheus-bagliano / commits / 9aef12673e
Fork 0

Don't yap about merge-subtree during make

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>

Shawn O. Pearce committed Apr 12, 2007 at 01:21 UTC 9aef12673e966fcbefea7716239e159c03b8d94e
1 file changed +1 -1
Makefile
+1 -1
@@ -728,7 +728,7 @@ git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS) GIT-CFLAGS
728 help.o: common-cmds.h
729
730 git-merge-subtree$X: git-merge-recursive$X
731 - rm -f $@ && ln git-merge-recursive$X $@
731 + $(QUIET_BUILT_IN)rm -f $@ && ln git-merge-recursive$X $@
732
733 $(BUILT_INS): git$X
734 $(QUIET_BUILT_IN)rm -f $@ && ln git$X $@