develooper Front page | perl.perl5.porters | Postings from March 2018

merge showing up in history of every file (Re: [perl #132800]lib/unicore/mktables takes too long)

From:
Craig A. Berry
Date:
March 2, 2018 17:59
Subject:
merge showing up in history of every file (Re: [perl #132800]lib/unicore/mktables takes too long)
Message ID:
CA+vYcVwx-xDRkoVncfbV6we-zDzGt1hQ-skBSda-=yiCZJ3fVQ@mail.gmail.com
On Thu, Feb 1, 2018 at 11:36 PM, Karl Williamson
<public@khwilliamson.com> wrote:

> And I have a question for you git people.  I was looking  at the blame
> history
>
> https://perl5.git.perl.org/perl.git/history/HEAD:/lib/unicore/mktables
>
> It includes
>
> https://perl5.git.perl.org/perl.git/commit/da4e040f42421764ef069371d77c008e6b801f45
>
> in the list of recent changes.  But I don't see that that commit actually
> modified mktables.  What's going on?

I believe it's because that merge was not a fast-forward merge so it
altered the state of the entire repository and now the history of
every file includes that commit.  Someone with more git fu can
probably explain it better.

This IMO is reason enough not to do merges that way and there was some
discussion at the time about that.  IIRC there is some way to exclude
such commits with git log when working from the command line, but that
doesn't do you any good with gitweb.



nntp.perl.org: Perl Programming lists via nntp and http.
Comments to Ask Bjørn Hansen at ask@perl.org | Group listing | About