Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1452092

Re: [GIT PULL] configfs updates for 4.8

Show all headers | View raw

On Thu, Jul 28, 2016 at 1:18 PM, Al Viro <viro@zeniv.linux.org.uk> wrote:
>
> FWIW, git request-pull is very likely to make complete mess of
> diffstat - all it takes is branch started at -rc1, then a merge from
> anything started at later point (e.g. Miklos asking to pull ->d_real()
> work from his tree into vfs.git, with his branch starting at -rc5).

Yes. git request-pull doesn't do a real merge, and if you have
multiple merge bases, the diffstat is usually garbage (because you
also end up getting diffs that are all about the differences in merge
bases, not the branch itself).

So people who have more complex git history are certainly encouraged to

 (a) do their own test-merge anyway, just to see that everything is
fine, and to be able to report to me about merge conflicts

 (b) use the result of that test-merge to generate a better diff-stat
than git request-pull does.

So yes, people who have more complex git trees are very much welcome
to improve on git request-pull output. It's aoppreciated.

What is *not* appreciated is when people send something worse ;)

git request-pull tends to do really well for simple and
straightforward git users, which is what it's geared towards. If you
have linear history and don't do back-merges (which you shouldn't do
unless you really really know what you are doing anyway), you'll never
see the limitations of the stupid "just diff against the merge base"
approach.

            Linus

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL] configfs updates for 4.8 Christoph Hellwig <hch@infradead.org> - 2016-07-28 15:40 +0200
  Re: [GIT PULL] configfs updates for 4.8 Linus Torvalds <torvalds@linux-foundation.org> - 2016-07-28 22:10 +0200
    Re: [GIT PULL] configfs updates for 4.8 Al Viro <viro@ZenIV.linux.org.uk> - 2016-07-28 22:20 +0200
      Re: [GIT PULL] configfs updates for 4.8 Linus Torvalds <torvalds@linux-foundation.org> - 2016-07-28 22:30 +0200
        Re: [GIT PULL] configfs updates for 4.8 James Bottomley <James.Bottomley@HansenPartnership.com> - 2016-07-29 00:10 +0200
    Re: [GIT PULL] configfs updates for 4.8 Christoph Hellwig <hch@infradead.org> - 2016-07-29 09:20 +0200
      Re: [GIT PULL] configfs updates for 4.8 Christoph Hellwig <hch@infradead.org> - 2016-07-29 10:00 +0200
  [GIT PULL] configfs updates for 4.8 Christoph Hellwig <hch@infradead.org> - 2016-07-29 10:00 +0200

csiph-web