From: Jeff King <peff@peff.net>
To: Elijah Newren <newren@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 2/6] log-tree: drop unused commit param in remerge_diff()
Date: Sat, 20 Aug 2022 03:04:37 -0400 [thread overview]
Message-ID: <YwCHhUGZvcRP9OQ2@coredump.intra.peff.net> (raw)
In-Reply-To: <CABPp-BHvscxV+vVL-Tew2H4h8V_3bZpD0Qz9uEMwrV=X3zrYSg@mail.gmail.com>
On Fri, Aug 19, 2022 at 04:05:06PM -0700, Elijah Newren wrote:
> > This function has never used its "commit" parameter since it was added
> > in db757e8b8d (show, log: provide a --remerge-diff capability,
> > 2022-02-02).
> >
> > This makes sense; we already have separate parameters for the parents
> > (which lets us redo the merge) and the oid of the result tree (which we
> > can then diff against the remerge result).
> [...]
>
> Yeah, looks like I could have just used commit instead of parents and
> oid, but since the calling code had those handy, I added them directly
> and forgot to remove commit.
That makes sense (the origin of these unused parameters are all
mini-mysteries, so it's very satisfying to me to hear a plausible
explanation).
I like using the broken-down parts as you ended up with. The sole caller
does have a commit, but one doesn't _need_ to have a commit to do a
remerge diff. You just need two tips and a proposed tree result. In
theory we could have a plumbing command which takes those individually.
-Peff
next prev parent reply other threads:[~2022-08-20 7:04 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-19 8:48 [PATCH 0/6] unused function parameter potpourri Jeff King
2022-08-19 8:49 ` [PATCH 1/6] xdiff: drop unused mmfile parameters from xdl_do_histogram_diff() Jeff King
2022-08-19 13:32 ` Phillip Wood
2022-08-20 6:58 ` Jeff King
2022-08-20 7:36 ` [PATCH 7/6] xdiff: drop unused mmfile parameters from xdl_do_patience_diff() Jeff King
2022-08-26 13:15 ` Phillip Wood
2022-08-19 8:50 ` [PATCH 2/6] log-tree: drop unused commit param in remerge_diff() Jeff King
2022-08-19 23:05 ` Elijah Newren
2022-08-20 7:04 ` Jeff King [this message]
2022-08-19 8:50 ` [PATCH 3/6] match_pathname(): drop unused "flags" parameter Jeff King
2022-08-19 8:51 ` [PATCH 4/6] verify_one_sparse(): drop unused repository parameter Jeff King
2022-08-19 19:04 ` Derrick Stolee
2022-08-20 7:01 ` Jeff King
2022-08-20 8:48 ` René Scharfe
2022-08-20 9:02 ` [PATCH v2 " Jeff King
2022-08-19 8:54 ` [PATCH 5/6] reftable: drop unused parameter from reader_seek_linear() Jeff King
2022-08-19 19:06 ` Derrick Stolee
2022-08-22 7:46 ` Han-Wen Nienhuys
2022-08-19 8:55 ` [PATCH 6/6] reflog: assert PARSE_OPT_NONEG in parse-options callbacks Jeff King
2022-08-19 19:08 ` [PATCH 0/6] unused function parameter potpourri Derrick Stolee
2022-08-19 23:07 ` Elijah Newren
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=YwCHhUGZvcRP9OQ2@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=newren@gmail.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).