Re: git log history simplification problem

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 4, 2014, 20:11 UTC
Message-ID: <xmqqiosu8wpv.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20140204173713.GC17861@collabora.co.uk>

Miklos Vajna <vmiklos@collabora.co.uk> writes:

Show 11 quoted lines

> 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.

Show 16 quoted lines

>
> 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