Re: Bug report

From: Jeff King <peff@peff.net>
Date: Sep 2, 2017, 08:49 UTC
Message-ID: <20170902084944.2mw64l5wod6vj3fh@sigill.intra.peff.net>
In-Reply-To: <db0580dc-3ce0-47ba-b82a-b1e50b9d0a3a@nsinfo.co.rs>

On Wed, Aug 30, 2017 at 11:25:00PM +0200, Aleksandar Pavic wrote:

Show 20 quoted lines

>  I have a file
> 
>  app/Controller/CustomerCardVerificationController.php
> 
> And when I take a look at changes log, I get this (no matter which tool I
> use):
> 
> 2017-07-31 19:41 dule             o membership renew payment email
> 2017-06-07 08:59 Dusan Tatic      o cc refund clean
> 2017-04-15 00:16 Miodrag Dragić   o refound admin payment
> 2017-03-20 12:02 Dusan Tatic      o CardVerification card connect
> 2017-03-16 15:59 Aleksandar Pavic o paypal
> 2017-03-10 13:34 Aleksandar Pavic o Production branch
> 2017-03-10 13:01 Aleksandar Pavic I Migrating dev
>
> However if I manually browse thru revisions and open revision from
> 03/27/2017 07:05 PM
> 
> I can see the change in that file which is unlisted above, at revision
> ff9f4946e109bd234d438e4db1d319b1f6cb6580

How are you invoking the log? Are you doing:

  git log app/Controller/CustomerCardVerificationController.php

or similar? If that is the case, then history simplification may be causing the results you see. And even you don't _see_ any merges in the output, that is because they were simplified away. And the commit you are looking for may have been on a side branch that was simplified away.

If you do:

  git log --full-history app/...

does the commit you are interested in show up? If so, then it was removed due to history simplification. And if you are surprised that a side branch was simplified away, that is most likely because there is a mis-merge in your history (some merge which threw away the changes on a side branch).

Try:

  git log --graph --oneline --name-status --full-history app/...

to see the whole shape of history, including which commits touched the file.

You can read more about it in the "History Simplification" section of "git help log".

-Peff