Documentation/maintainer/messy-diffstat.rst

1 .. SPDX-License-Identifier: GPL-2.0
4 Handling messy pull-request diffstats
7 Subsystem maintainers routinely use ``git request-pull`` as part of the
17 .. _Linus1: https://lore.kernel.org/lkml/CAHk-=wg3wXH2JNxkQi+eLZkpuxqV+wPiHhw_Jf7ViH33Sw7PHA@mail.g…
18 .. _Linus2: https://lore.kernel.org/lkml/CAHk-=wgXbSa8yq8Dht8at+gxb_idnJ7X5qWZQWRBN4_CUPr=eQ@mail.g…
23   ... vM --- vN-rc1 --- vN-rc2 --- vN-rc3 --- ... --- vN-rc7 --- vN
28   $ git diff --stat --summary vN-rc2..vN-rc3
31 "subtract" the beginning point from the end point and display the resulting
38   ... vM --- vN-rc1 --- vN-rc2 --- vN-rc3 --- ... --- vN-rc7 --- vN
40                           +-- c1 --- c2 --- ... --- cN
45 generated with ``git request-pull`` will also be as expected.  But now
48   ... vM --- vN-rc1 --- vN-rc2 --- vN-rc3 --- ... --- vN-rc7 --- vN
50                 |         +-- c1 --- c2 --- ... --- cN
52                 +-- x1 --- x2 --- x3
54 Our maintainer has created one branch at vN-rc1 and another at vN-rc2; the
56 for cN may end up being messy indeed, and developers often end up wondering
59 What is happening here is that there are no longer two clear end points for
63 starts at vN-rc1, it may end up including all of the changes between there
64 and the second origin end point (vN-rc2), which is certainly not what our
72 end of that pull request; rebasing and/or merging just before pushing
73 upstream is a well-known way to get a grumpy response.
80   ... vM --- vN-rc1 --- vN-rc2 --- vN-rc3 --- ... --- vN-rc7 --- vN
82                 |         +-- c1 --- c2 --- ... --- cN           |
84                 +-- x1 --- x2 --- x3                +------------+-- TEMP
91   $ git diff -C --stat --summary linus..TEMP