From: Junio C Hamano <gitster@pobox.com>
To: Jonathan del Strother <jdelstrother@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Expected behaviour of 'git log -S' when searching in a merged/deleted file?
Date: Thu, 23 Dec 2010 08:03:50 -0800 [thread overview]
Message-ID: <7vwrn0328p.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <AANLkTim4z3XvpjnEERuXgTE6CtA7D-dnBxSUgO3mE-FM@mail.gmail.com> (Jonathan del Strother's message of "Thu\, 23 Dec 2010 09\:47\:57 +0000")
Jonathan del Strother <jdelstrother@gmail.com> writes:
> .... If 'needle' was added
> and removed within the duration of a single branch, I could understand
> "git log -S" never finding 'needle' due to history simplication, but I
> don't understand how simplification applies here.
Ahh, sorry, I misunderstood the scenario. Just like you do not see a
patch output from "log -p", the diff machinery (including -S and its newer
cousin -G) does not kick in by default for merge commits (this is a bit of
white lie as "log -p" defaults to "combine diff", i.e. be silent on any
uninteresting merge that takes its results literally from either parent).
Please try it with "-m" (not "--full-history"). We _might_ want to change
this behaviour for -S/-G but it needs a bit more thought.
next prev parent reply other threads:[~2010-12-23 16:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-22 13:37 Expected behaviour of 'git log -S' when searching in a merged/deleted file? Jonathan del Strother
2010-12-22 18:17 ` Junio C Hamano
2010-12-23 9:47 ` Jonathan del Strother
2010-12-23 16:03 ` Junio C Hamano [this message]
2010-12-23 17:27 ` Jonathan del Strother
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=7vwrn0328p.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jdelstrother@gmail.com \
/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 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 NNTP newsgroup(s).