From: Magnus Holmgren <magnus.holmgren@milientsoftware.com>
To: git@vger.kernel.org
Subject: Please explain avoiding history simplifications when diffing merges
Date: Fri, 08 Sep 2023 11:09:20 +0200 [thread overview]
Message-ID: <3337579.YDm8p7mPUg@utklippan> (raw)
Hi (and thanks for a great free tool).
QGit was bitten by
https://github.com/git/git/commit/0dec322d31db3920872f43bdd2a7ddd282a5be67
It looks like passing --simplify-merges to override the default solves the
problem, but I still want to ask here because I'm not sure I fully understand
the reasoning:
> the default history simplification would remove merge commits from
> consideration if the file "path" matched the second parent.
I guess that means that even if there was a difference relative to the first
parent, which you wanted to see, the merge commit would be omitted if there's
no diff relative to the second parent? That's fine, and history simplification
isn't trivial, but now every merge commit ever is included in the commit log
of an individual file, even if that file was only added somewhere in the
middle and never changed since. Is that really desirable? Shouldn't it be
possible to include only merge commits that are not TREESAME to *all* parents?
Thanks,
--
Magnus Holmgren
./¯\_/¯\. Milient
(also holmgren@debian.org)
next reply other threads:[~2023-09-08 9:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-08 9:09 Magnus Holmgren [this message]
2023-09-15 15:10 ` Please explain avoiding history simplifications when diffing merges Magnus Holmgren
2023-09-17 9:58 ` Bagas Sanjaya
2023-09-25 16:11 ` Magnus Holmgren
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=3337579.YDm8p7mPUg@utklippan \
--to=magnus.holmgren@milientsoftware.com \
--cc=git@vger.kernel.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