Re: [GIT PULL] Please pull powerpc/linux.git powerpc-4.6-1 tag

[Michael Ellerman]

On Sat, 2016-03-19 at 15:57 -0700, Linus Torvalds wrote:
> On Fri, Mar 18, 2016 at 5:07 AM, Michael Ellerman <mpe@xxxxxxxxxxxxxx> wrote:
> >
> > I couldn't convince git request-pull to generate a sane diffstat below, it
> > seems to be confused because I merged powerpc-4.5-4 into my next.
>
> Yes, if there are multiple merge bases (particularly cross-merges, but
> you can get it just from internal merges of work that started at
> different points), a plain "git diff" will often be unable to give
> reasonable results.
>
> > So I just did the merge and took that diffstat. Hopefully that makes sense.
>
> Yes, that's the way to get a reliable diff if you have more complex history.

OK.

For some reason I thought git-request-pull had some magic to work out the right
diffstat, but I see now it's just a shell script that does git diff --stat.

> Some people do that merge by default (ie both the networking tree and
> the ARM SoC trees tend to do this), not just to get the reliable diff,
> but also to inform me of the conflicts that they encountered.

Yeah, I have been doing it to check for conflicts, but then throwing it away.
So I'll just change my process to do the test merge and then take the diff stat
for the pull request.

> Basically you should never hit that complicated case unless you are
> already using workflows that means that you can handle it, and by then
> you usually also end up understanding why clean history and avoiding
> back-merges is a good idea etc.
>
> Welcome to that second group.

Thanks.

cheers