* Anomaly in git log?
@ 2008-03-01 2:35 Stephen Rothwell
2008-03-01 3:05 ` Shawn O. Pearce
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2008-03-01 2:35 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 754 bytes --]
Hi,
I noticed that under some circumstances "git log <range> -- <file>" will
not show you all the commits in the range that affected that file. In
particular if one of the commits removes the file, previous modifying
commits are not shown.
I found this in the current linux-next tree (next-20080229).
git log stable.. -- arch/avr32/kernel/semaphore.c
will show the commit that removes this file, but not the commit that
modifies it. So, is this a bug in git log or my understanding?
If you do "git log -p stable.." and search for the file name, you will
find the other commit.
git version 1.5.4.3 from Debian unstable.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Anomaly in git log?
2008-03-01 2:35 Anomaly in git log? Stephen Rothwell
@ 2008-03-01 3:05 ` Shawn O. Pearce
0 siblings, 0 replies; 2+ messages in thread
From: Shawn O. Pearce @ 2008-03-01 3:05 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: git
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> I noticed that under some circumstances "git log <range> -- <file>" will
> not show you all the commits in the range that affected that file. In
> particular if one of the commits removes the file, previous modifying
> commits are not shown.
>
> I found this in the current linux-next tree (next-20080229).
>
> git log stable.. -- arch/avr32/kernel/semaphore.c
>
> will show the commit that removes this file, but not the commit that
> modifies it. So, is this a bug in git log or my understanding?
>
> If you do "git log -p stable.." and search for the file name, you will
> find the other commit.
I have seen this happen on my own day-job repositories. What is
most likely the case is the path got deleted on one side of a merge,
but was modified on the history of the other side. Since the file
is deleted in the merge the path limiter prunes the history and
doesn't include search down the other side looking for the modify.
Try adding --full-history to your git-log command line. But even
with that there are some cases where git-log prunes an interesting
side branch when the path limiter is being used.
--
Shawn.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-03-01 3:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-01 2:35 Anomaly in git log? Stephen Rothwell
2008-03-01 3:05 ` Shawn O. Pearce
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).