From: Junio C Hamano <gitster@pobox.com>
To: Bernt Hansen <bernt@norang.ca>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: git log -S doesn't find some commits
Date: Tue, 04 Nov 2008 17:30:20 -0800 [thread overview]
Message-ID: <7vy6zzm02b.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <877i7jrp67.fsf@gollum.intra.norang.ca> (Bernt Hansen's message of "Tue, 04 Nov 2008 19:29:04 -0500")
Bernt Hansen <bernt@norang.ca> writes:
> Junio C Hamano <gitster@pobox.com> writes:
> ...
>> There seems to be a misconception on what -S<foo> does. It does *NOT*
>> grep for string <foo> in the patch text. It counts number of <foo> in
>> preimage and postimage and decides that the commit is worth showing iff
>> they differ.
>>
>> If you look at, for example (B):
>>
>> http://repo.or.cz/w/org-mode.git?a=commitdiff;h=837c81ce51
>>
>> You can see that in org-publish.el, org-publish-validate-link appears once
>> as removed and once as added, so the total number of the appearance of the
>> symbol in preimage and postimage are the same.
>
> Now I get it :)
>
> Thanks both of you!
By the way, I would not be opposed to a new feature, perhaps triggered
with -G<foo>, that acts as if it is grepping inside the patch text.
The reason behind -S<foo>'s behaviour is because it was designed as a part
ofa "incremetal digging" tool before the current "git-blame" that allows
to track even line-movements.
That is, you could write a tool to help the following interactively:
(1) get interested in a block of text in a recent version;
(2) feed that to 'git log' like this:
git log -1 -p -S"$potentially_multi_line_text" $rev
this will find an old rev R whose parent R^ did not have the lines
in the exact form you fed with -S.
(3) inspect the output, and decide what to do next:
(3-a) you may want to adjust the text you look for, taking into
account how the neighbouring lines used to look like in R^, and run
another "git log -S" starting at R^; and/or
(3-b) you may want to run "git grep" for the text in the entire
tree in R^, to see if this was a code refactoring that consolidates
multiple copies of the same thing into a single place.
and go back to step (2).
cf. http://thread.gmane.org/gmane.comp.version-control.git/27/focus=217
next prev parent reply other threads:[~2008-11-05 1:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-04 22:59 git log -S doesn't find some commits Bernt Hansen
2008-11-04 23:06 ` Pieter de Bie
2008-11-04 23:15 ` Johannes Schindelin
2008-11-04 23:45 ` Junio C Hamano
2008-11-05 0:29 ` Bernt Hansen
2008-11-05 1:30 ` Junio C Hamano [this message]
2008-11-05 0:25 ` Bernt Hansen
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=7vy6zzm02b.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=bernt@norang.ca \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.