git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Karsten Blees" <karsten.blees@gmail.com>,
	"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
	"Stefan Beller" <sbeller@google.com>,
	"Eric Sunshine" <sunshine@sunshineco.com>,
	"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
	"Johannes Sixt" <j6t@kdbg.org>, "René Scharfe" <l.s.r@web.de>,
	"Stefan Naewe" <stefan.naewe@atlas-elektronik.com>,
	"Christian Couder" <chriscool@tuxfamily.org>
Subject: [PATCH v13 07/14] apply: don't print on stdout in verbosity_silent mode
Date: Sat, 27 Aug 2016 20:45:40 +0200	[thread overview]
Message-ID: <20160827184547.4365-8-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20160827184547.4365-1-chriscool@tuxfamily.org>

When apply_verbosity is set to verbosity_silent nothing should be
printed on both stderr and stdout.

To avoid printing on stdout, we can just skip calling the following
functions:

	- stat_patch_list(),
	- numstat_patch_list(),
	- summary_patch_list().

It is safe to do that because the above functions have no side
effects other than printing:

- stat_patch_list() only computes some local values and then call
show_stats() and print_stat_summary(), those two functions only
compute local values and call printing functions,
- numstat_patch_list() also only computes local values and calls
printing functions,
- summary_patch_list() calls show_file_mode_name(), printf(),
show_rename_copy(), show_mode_change() that are only printing.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 apply.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apply.c b/apply.c
index df85cbc..ddbb0a2 100644
--- a/apply.c
+++ b/apply.c
@@ -4702,13 +4702,13 @@ static int apply_patch(struct apply_state *state,
 		goto end;
 	}
 
-	if (state->diffstat)
+	if (state->diffstat && state->apply_verbosity > verbosity_silent)
 		stat_patch_list(state, list);
 
-	if (state->numstat)
+	if (state->numstat && state->apply_verbosity > verbosity_silent)
 		numstat_patch_list(state, list);
 
-	if (state->summary)
+	if (state->summary && state->apply_verbosity > verbosity_silent)
 		summary_patch_list(list);
 
 end:
-- 
2.9.2.770.g14ff7d2


  parent reply	other threads:[~2016-08-27 18:46 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-27 18:45 [PATCH v13 00/14] libify apply and use lib in am, part 3 Christian Couder
2016-08-27 18:45 ` [PATCH v13 01/14] builtin/apply: rename option parsing functions Christian Couder
2016-08-27 18:45 ` [PATCH v13 02/14] apply: rename and move opt constants to apply.h Christian Couder
2016-08-31 21:46   ` Stefan Beller
2016-09-01  8:03     ` Christian Couder
2016-08-27 18:45 ` [PATCH v13 04/14] apply: make some parsing functions static again Christian Couder
2016-08-31 21:58   ` Stefan Beller
2016-08-27 18:45 ` [PATCH v13 05/14] apply: use error_errno() where possible Christian Couder
2016-08-31 21:59   ` Stefan Beller
2016-08-27 18:45 ` [PATCH v13 06/14] apply: make it possible to silently apply Christian Couder
2016-08-31 22:07   ` Stefan Beller
2016-09-01  8:01     ` Christian Couder
2016-09-01 16:57       ` Stefan Beller
2016-08-27 18:45 ` Christian Couder [this message]
2016-08-27 18:45 ` [PATCH v13 08/14] usage: add set_warn_routine() Christian Couder
2016-08-27 18:45 ` [PATCH v13 09/14] usage: add get_error_routine() and get_warn_routine() Christian Couder
2016-08-27 18:45 ` [PATCH v13 10/14] apply: change error_routine when silent Christian Couder
2016-08-31 22:20   ` Stefan Beller
2016-09-01  8:19     ` Christian Couder
2016-09-04 10:54       ` Christian Couder
2016-09-04 16:31         ` Ramsay Jones
2016-09-04 16:45           ` Christian Couder
2016-08-27 18:45 ` [PATCH v13 11/14] apply: refactor `git apply` option parsing Christian Couder
2016-08-27 18:45 ` [PATCH v13 12/14] apply: pass apply state to build_fake_ancestor() Christian Couder
2016-08-27 18:45 ` [PATCH v13 13/14] apply: learn to use a different index file Christian Couder
2016-08-27 18:45 ` [PATCH v13 14/14] builtin/am: use apply API in run_apply() Christian Couder
2016-08-31 22:33   ` Stefan Beller
2016-09-01  7:41     ` Christian Couder
2016-08-27 18:49 ` [PATCH v13 00/14] libify apply and use lib in am, part 3 Christian Couder
2016-08-29 19:04 ` Junio C Hamano
2016-08-29 19:52   ` Junio C Hamano
2016-08-30 10:19   ` Christian Couder
2016-08-31 22:15     ` Junio C Hamano
2016-09-01  8:28       ` Christian Couder
2016-09-01 17:48         ` Junio C Hamano
2016-09-04 20:17           ` Christian Couder
     [not found] ` <20160827184547.4365-4-chriscool@tuxfamily.org>
2016-08-31 21:57   ` [PATCH v13 03/14] Move libified code from builtin/apply.c to apply.{c,h} Stefan Beller
2016-09-01  7:46     ` Christian Couder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160827184547.4365-8-chriscool@tuxfamily.org \
    --to=christian.couder@gmail.com \
    --cc=avarab@gmail.com \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=karsten.blees@gmail.com \
    --cc=l.s.r@web.de \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=ramsay@ramsayjones.plus.com \
    --cc=sbeller@google.com \
    --cc=stefan.naewe@atlas-elektronik.com \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).