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

Subsystems: kernel build + files below scripts/ (unless maintained elsewhere), the rest

DORMANTno replies

2 messages, 1 author, 2016-06-15 · open the first message on its own page

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

From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:43:04

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

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

From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:43:04

"Shawn O. Pearce" [off-list ref] 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 <redacted>


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

-- 
Shawn.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help