Thread (42 messages) flat view 42 messages, 1 author, 2016-06-27
STALE3732d

Revision v8 of 6 in this series.

Revisions (6)
  1. v6 [diff vs current]
  2. v7 [diff vs current]
  3. v8 current
  4. v9 [diff vs current]
  5. v10 [diff vs current]
  6. v14 [diff vs current]

[PATCH v8 36/41] apply: don't print on stdout when be_silent is set

From: Christian Couder <hidden>
Date: 2016-06-27 18:26:30
Subsystem: the rest · Maintainer: Linus Torvalds

This variable should prevent anything to be printed on both stderr
and stdout.

Signed-off-by: Christian Couder <redacted>
---
 apply.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/apply.c b/apply.c
index 1435f85..e2acc18 100644
--- a/apply.c
+++ b/apply.c
@@ -4698,13 +4698,13 @@ static int apply_patch(struct apply_state *state,
 		goto end;
 	}
 
-	if (state->diffstat)
+	if (state->diffstat && !state->be_silent)
 		stat_patch_list(state, list);
 
-	if (state->numstat)
+	if (state->numstat && !state->be_silent)
 		numstat_patch_list(state, list);
 
-	if (state->summary)
+	if (state->summary && !state->be_silent)
 		summary_patch_list(list);
 
 end:
-- 
2.9.0.172.gfb57a78
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help