Lines Matching +full:pull +full:- +full:up

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
13 pull request is actually doing.  This document describes what is happening
14 and how to fix things up; it is derived from The Wisdom of Linus Torvalds,
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
38   ... vM --- vN-rc1 --- vN-rc2 --- vN-rc3 --- ... --- vN-rc7 --- vN
40                           +-- c1 --- c2 --- ... --- cN
44 clear endpoints, and the result is as expected.  So a pull request
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
55 two were then subsequently merged into c2.  Now a pull request generated
56 for cN may end up being messy indeed, and developers often end up wondering
62 ends up having pick one of them and hoping for the best.  If the diffstat
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
66 may be impossible to tell what actually happened in the changes leading up
71 the pull request.  This approach tends not to lead to joy at the receiving
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
95 output and edit it into the messy pull request, yielding a result that