From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: <git@vger.kernel.org>, Steven Rostedt <rostedt@goodmis.org>
Subject: Re: Should "git apply --check" imply verbose?
Date: Tue, 20 Aug 2013 14:45:49 -0400 [thread overview]
Message-ID: <5213B95D.3040409@windriver.com> (raw)
In-Reply-To: <xmqqioz06y9m.fsf@gitster.dls.corp.google.com>
On 13-08-20 01:57 PM, Junio C Hamano wrote:
> Paul Gortmaker <paul.gortmaker@windriver.com> writes:
>
>> TL;DR -- "git apply --reject" implies verbose, but the similar
>> "git apply --check" does not, which seems inconsistent.
>
> Hmmm, I am of two minds. From purely idealistic point of view, I
> can see why defaulting both to non-verbose may look a more
> attractive way to go, but I have my reservations that is more than
> the usual change-aversion.
OK, so given your feedback, how do you feel about a patch to the
documentation that indicates to use "-v" in combination with the
"--check" to get equivalent "patch --dry-run" behaviour? If that
had existed, I'd have not gone rummaging around in the source, so
that should be good enough to help others avoid the same...
P.
--
>
> Historically, "check" was primarily meant to see if the patch is
> applicable cleanly in scripts, and we never thought it would make
> any sense to make it verbose by default.
>
> On the other hand, the operation of "reject", which was a much later
> invention, was primarily meant to be observed by humans to see how
> the patch failed to cleanly apply and where, to help them decide
> where to look in the target to wiggle the rejected hunk into (even
> when it is driven from a script). It did not make much sense to
> squelch its output.
>
> In addition, because "check" is an idempotent operation that does
> not touch anything in the index or the working tree, running with
> "check" and then "check verbose" is possible if somebody runs it
> without verbose and then decides later that s/he wants to see the
> details. But "reject" does touch the working tree files with
> applicable hunks, so after a quiet "reject", there is no way to see
> the verbose output like you can with "check".
>
next prev parent reply other threads:[~2013-08-20 18:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-20 15:11 Should "git apply --check" imply verbose? Paul Gortmaker
2013-08-20 17:57 ` Junio C Hamano
2013-08-20 18:45 ` Paul Gortmaker [this message]
2013-08-20 18:51 ` Jonathan Nieder
2013-08-20 18:59 ` Paul Gortmaker
2013-08-20 19:07 ` Junio C Hamano
2013-08-20 19:15 ` Steven Rostedt
2013-08-20 19:45 ` Junio C Hamano
2013-08-20 19:54 ` Steven Rostedt
2013-08-20 20:19 ` Paul Gortmaker
2013-08-20 21:44 ` Junio C Hamano
2013-08-20 21:43 ` Junio C Hamano
2013-08-20 22:37 ` Steven Rostedt
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=5213B95D.3040409@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rostedt@goodmis.org \
/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).