git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Don't yap about merge-subtree during make
@ 2007-04-12  5:21 Shawn O. Pearce
  2007-04-12  5:49 ` Shawn O. Pearce
  0 siblings, 1 reply; 2+ messages in thread
From: Shawn O. Pearce @ 2007-04-12  5:21 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

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(-)

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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Don't yap about merge-subtree during make
  2007-04-12  5:21 [PATCH] Don't yap about merge-subtree during make Shawn O. Pearce
@ 2007-04-12  5:49 ` Shawn O. Pearce
  0 siblings, 0 replies; 2+ messages in thread
From: Shawn O. Pearce @ 2007-04-12  5:49 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

"Shawn O. Pearce" <spearce@spearce.org> wrote:
> 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.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-04-12  5:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-04-12  5:21 [PATCH] Don't yap about merge-subtree during make Shawn O. Pearce
2007-04-12  5:49 ` Shawn O. Pearce

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).