From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Junio C Hamano <gitster@pobox.com>
Cc: Francis Moreau <francis.moro@gmail.com>,
git@vger.kernel.org, Johannes Sixt <j6t@kdbg.org>
Subject: Re: Can't find the revelant commit with git-log
Date: Thu, 10 Feb 2011 19:50:35 +0100 [thread overview]
Message-ID: <4D54337B.6040307@lsrfire.ath.cx> (raw)
In-Reply-To: <7vk4hbsbjr.fsf@alter.siamese.dyndns.org>
Am 07.02.2011 23:51, schrieb Junio C Hamano:
> René Scharfe<rene.scharfe@lsrfire.ath.cx> writes:
>
>> diff --git a/t/t6016-rev-list-graph-simplify-history.sh b/t/t6016-rev-list-graph-simplify-history.sh
>> index f7181d1..50ffcf4 100755
>> --- a/t/t6016-rev-list-graph-simplify-history.sh
>> +++ b/t/t6016-rev-list-graph-simplify-history.sh
>> @@ -168,6 +168,7 @@ test_expect_success '--graph --full-history --simplify-merges -- bar.txt' '
>> echo "|\\ ">> expected&&
>> echo "| * $C4">> expected&&
>> echo "* | $A5">> expected&&
>> + echo "* | $A4">> expected&&
>> echo "* | $A3">> expected&&
>> echo "|/ ">> expected&&
>> echo "* $A2">> expected&&
>
> Thanks for a patch with a test; I am not sure if this is quite correct,
> though.
>
> A4 has three parents, C2, A3 and B2, and does not introduce any change
> with respect to bar.txt. A6 has bar.txt identical to that of A5, but we
> cannot omit it because we are showing its two parents (A5 and C4), and
> that is why we show it. A4 isn't even gets shown as a merge, so I don't
> understand why we need to show it?
Yes, this looks a bit silly on closer look. I thought that it matches
Francis' use case, but that's wrong -- having --simplify-merges instead
of -Sstring makes a difference, obviously.
After looking at the case again, I think I have a simpler solution: no
code change, just add --sparse (include all walked commits). This gives
the same results as the patched version:
$ git log --oneline -m --sparse --full-history \
-Sblacklist_iommu v2.6.26..v2.6.29 -- \
drivers/pci/intel-iommu.c | wc -l
160
Sorry for the noise.
So, the lesson would be: If you want to find commits that removed a
certain string in a certain set of files, add --full-history, -m and
--sparse to your "git log -Sstring -- files" command. This allows you
to catch merges that reverted those files to a state before the string
was introduced in the first place, otherwise history simplification can
hide them.
I'm not sure if there's a way to make the flags and their interactions
more intituitive.
René
next prev parent reply other threads:[~2011-02-10 18:50 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-25 9:01 Can't find the revelant commit with git-log Francis Moreau
2011-01-25 16:12 ` René Scharfe
2011-01-25 17:44 ` Francis Moreau
2011-01-26 8:36 ` Francis Moreau
2011-01-26 10:44 ` Johannes Sixt
2011-01-26 20:56 ` Francis Moreau
2011-01-26 21:03 ` Sverre Rabbelier
2011-01-26 21:08 ` Francis Moreau
2011-01-26 21:14 ` Sverre Rabbelier
2011-01-26 21:31 ` Francis Moreau
2011-01-26 21:24 ` Junio C Hamano
2011-01-26 21:32 ` Francis Moreau
2011-01-26 18:11 ` René Scharfe
2011-01-28 20:29 ` René Scharfe
2011-01-29 0:02 ` Junio C Hamano
2011-01-29 2:34 ` René Scharfe
2011-01-29 5:47 ` Junio C Hamano
2011-01-29 20:26 ` René Scharfe
2011-02-01 21:28 ` Junio C Hamano
2011-02-07 22:51 ` Junio C Hamano
2011-02-10 18:50 ` René Scharfe [this message]
2011-01-29 20:26 ` René Scharfe
2011-01-28 22:01 ` René Scharfe
2011-01-29 12:52 ` Francis Moreau
2011-01-29 13:02 ` René Scharfe
2011-01-29 13:57 ` Francis Moreau
2011-01-29 15:17 ` René Scharfe
2011-01-26 9:01 ` Francis Moreau
2011-01-26 18:39 ` René Scharfe
2011-01-26 19:50 ` Francis Moreau
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=4D54337B.6040307@lsrfire.ath.cx \
--to=rene.scharfe@lsrfire.ath.cx \
--cc=francis.moro@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.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).