From: "Steinar H. Gunderson" <steinar+git@gunderson.no>
To: Derrick Stolee <derrickstolee@github.com>
Cc: git@vger.kernel.org
Subject: Re: git log --follow wrongly includes delete commit
Date: Thu, 26 Jan 2023 18:18:30 +0100 [thread overview]
Message-ID: <20230126171830.6qb46wa2ed5h2z3b@sesse.net> (raw)
In-Reply-To: <fcc08ee2-dc58-09da-dc60-c438cfbf6602@github.com>
On Thu, Jan 26, 2023 at 11:38:42AM -0500, Derrick Stolee wrote:
> It's actually a third option: it was deleted but also renamed in an
> independent point in history, but the delete is more recent "in time"
> that it shows up first, and the merge that resolves the issue doesn't
> show up at all.
I see! So basically my parser needs to also start tracking merges,
except --follow seems to be sort of odd with those as well (though
I think maybe it's changed in some fairly recent git version).
> (Note: I didn't include --follow here as it filtered the --graph
> output in a strange way, including dropping the merge commitswhich was
> confusing to me.)
I think you need to give -c or --cc or something similar to see merges in
--follow, but the man pages are not entirely clear to me.
/* Steinar */
--
Homepage: https://www.sesse.net/
prev parent reply other threads:[~2023-01-26 17:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-26 13:05 git log --follow wrongly includes delete commit Steinar H. Gunderson
2023-01-26 16:38 ` Derrick Stolee
2023-01-26 17:18 ` Steinar H. Gunderson [this message]
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=20230126171830.6qb46wa2ed5h2z3b@sesse.net \
--to=steinar+git@gunderson.no \
--cc=derrickstolee@github.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.
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).