From: Jeff King <peff@peff.net>
To: Philip Oakley <philipoakley@iee.email>
Cc: Git List <git@vger.kernel.org>
Subject: Re: Trimming 'deadheads' (TREESAME 2nd parent) from revision walks?
Date: Sun, 19 Sep 2021 14:59:36 -0400 [thread overview]
Message-ID: <YUeImAqA0SZAdA2R@coredump.intra.peff.net> (raw)
In-Reply-To: <01fe28d8-2887-bc42-c91b-c3237b5186a7@iee.email>
On Sat, Sep 18, 2021 at 03:18:47PM +0100, Philip Oakley wrote:
> Is there a method within `git rev-list` to trim side branch merges where
> the merge's tree is identical to the first parent's commit-tree?
> [...]
> From my reading of the `rev-list` manual this is similar to the <paths>
> TREESAME capability, but without specifying any paths (maybe just `.` ?).
Yes, I'd just do "git log ." for this. I don't think there's another way
to trigger simplification. In try_to_simplify_commit(), we bail early
unless revs->prune is set, and that is set only by the presence of
pathspecs or by --simplify-by-decoration.
> * Is there a proper term for the treesame condition of the commit-tree
> (as recorded in the commit object)?
In a one-parent commit, I'd just call it an empty commit. For a merge,
it is really I'd probably call it an "ours" merge, since one obvious way
to get there is with "git merge -s ours" (of course you can also just
resolve all conflicts in favor of one parent). I don't know of another
name (besides treesame, of course, but that generally implies a
particular scope of interest given by a pathspec).
-Peff
next prev parent reply other threads:[~2021-09-19 19:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-18 14:18 Trimming 'deadheads' (TREESAME 2nd parent) from revision walks? Philip Oakley
2021-09-19 18:59 ` Jeff King [this message]
2021-09-19 23:44 ` Ævar Arnfjörð Bjarmason
2021-09-20 11:40 ` Philip Oakley
2021-09-20 20:50 ` Jeff King
2021-09-21 13:36 ` Philip Oakley
2021-09-21 18:24 ` Philip Oakley
2021-10-05 10:53 ` Johannes Schindelin
2021-10-06 14:03 ` Philip Oakley
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=YUeImAqA0SZAdA2R@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=philipoakley@iee.email \
/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).