From: Junio C Hamano <gitster@pobox•com>
To: Miklos Vajna <vmiklos@collabora•co.uk>
Cc: git@vger•kernel.org
Subject: Re: git log history simplification problem
Date: Tue, 04 Feb 2014 12:11:08 -0800 [thread overview]
Message-ID: <xmqqiosu8wpv.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140204173713.GC17861@collabora.co.uk> (Miklos Vajna's message of "Tue, 4 Feb 2014 18:37:14 +0100")
Miklos Vajna <vmiklos@collabora•co.uk> writes:
> Hi,
>
> I was trying to understand the history of a piece of code in LibreOffice
> and I'm facing a behaviour of git-log which is not something I can
> explain. I'm not sure if this is a git bug or a user error. ;)
>
> Here is the situation:
>
> git clone git://anongit.freedesktop.org/libreoffice/core
> cd core
> git log --full-history -p -S'mnTitleBarHeight =' sd/source/ui/dlg/PaneDockingWindow.cxx
Lack of -m is what I would first suspect when somebody
misunderstands "merge simplification". I am not saying that will be
the issue, but merely pointing out that that is the first thing that
jumps at me when I view the above command line.
>
> Here the first output I get from git-log is
> b390fae1706b9c511158a03e4fd61f263be4e511, where you can see that the
> commit *added* that string. So it should be there on master, I would
> assume.
>
> But then I run:
>
> git grep 'mnTitleBarHeight =' sd
>
> and it's not there. Am I missing something, as in e.g. even with
> --full-history git-log does some simplification?
>
> Thanks,
>
> Miklos
prev parent reply other threads:[~2014-02-04 20:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-04 17:37 git log history simplification problem Miklos Vajna
2014-02-04 19:05 ` Miklos Vajna
2014-02-04 19:48 ` Jonathan Nieder
2014-02-04 20:07 ` Miklos Vajna
2014-02-04 20:11 ` Junio C Hamano [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqiosu8wpv.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=vmiklos@collabora$(echo .)co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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