From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Git mailing list <git@vger.kernel.org>
Subject: Weird revision walk behaviour
Date: Wed, 23 May 2018 19:10:58 +0200 [thread overview]
Message-ID: <CAM0VKjkr71qLfksxZy59o4DYCM-x=podsCf6Qv+PzZuSe1gXZw@mail.gmail.com> (raw)
There is this topic 'jt/partial-clone-proto-v2' currently cooking in
'next' and pointing to ba95710a3b ({fetch,upload}-pack: support filter
in protocol v2, 2018-05-03). This topic is built on top of the merge
commit ea44c0a594 (Merge branch 'bw/protocol-v2' into
jt/partial-clone-proto-v2, 2018-05-02), which gives me the creeps,
because it shows up in some pathspec-limited revision walks where in
my opinion it should not:
$ git log --oneline master..ba95710a3b -- ci/
ea44c0a594 Merge branch 'bw/protocol-v2' into jt/partial-clone-proto-v2
But as far as I can tell, there are no changes in the 'ci/' directory
on any of the merge's parents:
$ git log --oneline master..ea44c0a594^1 -- ci/
# Nothing.
$ git log --oneline master..ea44c0a594^2 -- ci/
# Nothing!
And to add to my confusion:
$ git log -1 --oneline master@{1.week.ago}
ccdcbd54c4 The fifth batch for 2.18
$ git log --oneline master@{1.week.ago}..ea44c0a594 -- ci/
ea44c0a594 Merge branch 'bw/protocol-v2' into jt/partial-clone-proto-v2
$ git log -1 --oneline master@{3.week.ago}
1f1cddd558 The fourth batch for 2.18
$ git log --oneline master@{3.week.ago}..ea44c0a594 -- ci/
# Nothing, as it is supposed to be, IMHO.
This is not specific to the 'ci/' directory, it seems that any
untouched directory does the trick:
$ git log --oneline master..ea44c0a594 -- contrib/coccinelle/ t/lib-httpd/
ea44c0a594 Merge branch 'bw/protocol-v2' into jt/partial-clone-proto-v2
$ git log --oneline master..ea44c0a594^1 -- contrib/coccinelle/ t/lib-httpd/
# Nothing.
$ git log --oneline master..ea44c0a594^2 -- contrib/coccinelle/ t/lib-httpd/
# Nothing.
$ git log --oneline master@{3.week.ago}..ea44c0a594 --
contrib/coccinelle/ t/lib-httpd/
# Nothing, but this is what I would expect.
I get the same behavior with Git built from current master and from
past releases as well (tried it as far back as v2.0.0).
So... what's going on here? :)
A bug? Or am I missing something? Some history simplification corner
case that I'm unaware of?
next reply other threads:[~2018-05-23 17:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-23 17:10 SZEDER Gábor [this message]
2018-05-23 17:32 ` Weird revision walk behaviour Jeff King
2018-05-23 17:35 ` Jeff King
2018-05-24 18:54 ` Kevin Bracey
2018-05-24 20:26 ` Kevin Bracey
2018-05-27 17:37 ` Kevin Bracey
2018-05-28 22:06 ` SZEDER Gábor
2018-05-29 6:11 ` Kevin Bracey
2018-05-29 21:04 ` Jeff King
2018-05-30 8:20 ` Kevin Bracey
2018-05-31 5:43 ` Jeff King
2018-05-31 14:54 ` Kevin Bracey
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='CAM0VKjkr71qLfksxZy59o4DYCM-x=podsCf6Qv+PzZuSe1gXZw@mail.gmail.com' \
--to=szeder.dev@gmail.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).