Re: [BUG] git-log: tracking deleted file in a repository with multiple "initial commit" histories

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Feb 16, 2016 at 01:24:29PM -0800, Brian Norris wrote:

> On Tue, Feb 16, 2016 at 03:45:57PM -0500, Jeff King wrote:
> > See the section on History Simplification in git-log. But basically,
> > when you specify a pathspec, git does not traverse side branches that
> > had no effect on the given pathspec.
> 
> Thanks for the pointer. Is this done primarily for performance reasons,
> or for UI simplicity (e.g., to avoid some kinds of double-counting)?
> Seems like it generates unintuitive behaviors, but if it's helping block
> other unintuitive behaviors, then maybe it can't be resolved easily.

Both, I think. Try looking at "--full-history" and you will see that it
has a lot of cruft that is probably not that interesting. But
simplifying further (e.g., with "--simplify-merges") doesn't tell much
of the whole story (or maybe it does; we do see the final deletion
there, which is the end state).

But it's been a long time since I've thought hard on simplification like
this. Most of these issues were resolved many years ago; you'd have to
dig in the list archives to get the full story.

> FWIW, I quite often use git-log to look at the history of a deleted
> file. Seems like a pretty big hole if the default behavior is going to
> prune away the entire history of the file.

It doesn't normally. What happened is that you had two parallel
histories, and the final state of the file could be explained by
following the simpler of the two histories (the one where it never
existed in the first place).

> > If you want to see the full history, you can with "--full-history"
> > (there are some other simplification possibilities, but I don't think
> > any of them are interesting for your particular case).
> 
> --full-history gives me what I want (I'll admit, I didn't read through
> all the other "History Simplification" documentation). Can I make this
> the default somehow?

No, but you can make an alias that includes it.

-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]