From: Jeff King <peff@peff.net>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Johannes Postler <johannes.postler@txture.io>,
Git List <git@vger.kernel.org>
Subject: Re: [PATCH 3/3] format-patch: support --output option
Date: Wed, 4 Nov 2020 14:15:59 -0500 [thread overview]
Message-ID: <20201104191559.GA3053889@coredump.intra.peff.net> (raw)
In-Reply-To: <CAPig+cQ7t1by2X0xwddyo40sQdb9BPBKmERpqKR6oMD82kUwgg@mail.gmail.com>
On Wed, Nov 04, 2020 at 12:27:30PM -0500, Eric Sunshine wrote:
> > diff --git a/builtin/log.c b/builtin/log.c
> > @@ -1942,11 +1942,18 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
> > + } else if (rev.diffopt.close_file) {
> > + /*
> > + * The diff code parsed --output; it has already opened the
> > + * file, but but we must instruct it not to close after each
> > + * diff.
> > + */
> > + rev.diffopt.close_file = 0;
> > } else {
>
> The commit message's justification for supporting --output seems
> reasonable. However, my knee-jerk reaction to the implementation was
> that it feels overly magical and a bit too hacky. I can see the logic
> in it but it also leaves a bad taste when the implementation has to
> "undo" a side-effect of some other piece of code, which makes it feel
> unplanned and fragile. The question which popped into my mind
> immediately was "why not handle --output explicitly via
> builtin_format_patch_options[] along with other first-class options?".
> This review comment may or may not be actionable; it's just expressing
> surprise and a bit of nose-wrinkling I experienced.
I agree it's a bit magical. I didn't really consider writing a new
"--output" option for format-patch, because I came at it from the angle
of "let's unbreak the existing diff --output option". Which isn't
necessarily a defense, but just an explanation.
FWIW, that unsetting of rev.diffopt.close_file is exactly how git-log
does it. So while I agree it's a bit ugly, this is the intended way for
--output to be used across multiple diffs, and with log_tree_commit().
I'd prefer to go this way for now, and if somebody wants to make it less
ugly, they can clean up all of the callers in one go.
Amusingly, 6ea57703f6 (log: prepare log/log-tree to reuse the
diffopt.close_file attribute, 2016-06-22) which introduced this code
foresaw the format-patch bug here.
-Peff
next prev parent reply other threads:[~2020-11-04 19:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-04 10:18 [Bug report] Crash when creating patch Johannes Postler
2020-11-04 13:24 ` Jeff King
2020-11-04 13:25 ` [PATCH 1/3] format-patch: refactor output selection Jeff King
2020-11-04 17:01 ` Eric Sunshine
2020-11-04 17:13 ` Jeff King
2020-11-04 13:27 ` [PATCH 2/3] format-patch: tie file-opening logic to output_directory Jeff King
2020-11-04 17:03 ` Eric Sunshine
2020-11-04 13:29 ` [PATCH 3/3] format-patch: support --output option Jeff King
2020-11-04 17:27 ` Eric Sunshine
2020-11-04 19:15 ` Jeff King [this message]
2020-11-04 20:16 ` Eric Sunshine
2020-11-04 18:00 ` Junio C Hamano
2020-11-04 19:26 ` [PATCH v2] format-patch --output Jeff King
2020-11-04 19:28 ` [PATCH v2 1/3] format-patch: refactor output selection Jeff King
2020-11-04 19:28 ` [PATCH v2 2/3] format-patch: tie file-opening logic to output_directory Jeff King
2020-11-04 19:28 ` [PATCH v2 3/3] format-patch: support --output option Jeff King
2020-11-05 6:30 ` [PATCH v2] format-patch --output Johannes Postler
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201104191559.GA3053889@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=johannes.postler@txture.io \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).