doc: Hold down best practices for pull requests
PATCH 1/1 doc: Hold down best practices for pull requests
From: Borislav Petkov <[email protected]>
Hold down some important points to pay attention to when preparing a pull request to upper-level maintainers and/or Linus. Based on a couple of agitated mails from Linus to maintainers and random crowd sitting around.
---
Ok,
so here's what I have. I took your message from yesterday and morphed/fleshed it out into a set of points to pay attention to when prepping a pull request. I also sampled some more rants from last year to get a couple more recurring issues.
I hope I've covered the most important points.
Thanks.
Documentation/SubmittingPullRequests | 148 +++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 Documentation/SubmittingPullRequests
Documentation/SubmittingPullRequests new file +148 -0
@@ -0,0 +1,148 @@ + Trees, merges and other hints for maintainers of all levels + =========================================================== + +... or how do I send my tree to Linus without him biting my head off. + + +This is a collection of hints, notes, suggestions and accepted practices +for sending pull requests to (other maintainers which then forward those +trees to) Linus. It is loosely based on Linus' friendly and polite hints +to maintainers on the Linux Kernel Mailing List and the idea behind it +is to document the most apparent do's and dont's, thus saving time and +money of everyone involved. + +Basically, pull requests and merge commits adhering to the guidelines +described below should establish certain practices which make +development history as presentable, useful and sensible as possible. + +People staring at it should be able to understand what went where, when +and why, without encountering senseless merge commits and internal +subsystem development state which don't have any bearing on the final, +cast-in-stone history. A second, not less important reason is tree +bisectability. + +Here we go: + +0.) Before asking any maintainer to pull a pile of patches, make damn +well sure that said pile is stable, works, and has been extensively, +thoroughly and to the best of your abilities, tested. There's absolutely +no reason in rushing half-cooked patches just because your manager says +so. Rule of thumb is: if the patches are so done that they're boringly +missing any issues or regressions and you've almost forgotten them in +linux-next, *then* you can send. + +1.) The patchset going to an upper level maintainer should NOT be based +on some random, potentially completely broken commit in the middle of a +merge window, or some other random point in the tree history. + +Tangential to that, it shouldn't contain back-merges - not to "next" +trees, and not to a "random commit of the day" in Linus' tree. + +Why, you ask? + +Linus: "Basically, I do not want people's development trees to worry +about some random crazy merge-window tree of the day. You should always +pick a good starting point that makes sense (where "makes sense" is very +much about "it's stable and well known" and just do your own thing. What +other people do should simply not concern you over-much. You are the +[ ... ] maintainer, and your job is not integration, it's to make sure +that *your* work is as stable and unsurprising as possible." + +2.) Write a sensible, human-readable mail message explaining in terms +understandable to outsiders what your patchset entails, maybe describe +the high-level big picture of where your patchset fits and why. And +do not use abbreviations - they might be clear to you and the people +working on your subsystem but not necessarily to the rest of the world. +Also, include the diffstat in that mail (git request-pull should take +care of all that nicely). + +3.) GPG-sign your pull request and put the high-level description you've +created into the signed tag. Of course, your key should be signed by +fellow developers who are in the chain of trust of the receiving end of +your pull request. + +4.) The URL of your pull request should contain the signed tag. Make +sure that URL is valid and externally accessible. This is especially +valid for the k.org crowd who get it wrong a *lot*. Also, people tend to +forget to push the signed tag. + +5.) THEN AND ONLY THEN do we start worrying about possible merge issues +your pull request could cause with upstream. It can be very helpful if +you look into and describe them in the pull request mail, maybe even do +an *example* merge. This merge won't normally be used but it is very +helpful to show the person doing the merge how to resolve possible +conflicts. + +Here's Linus counting the ways why you shouldn't make merges yourself: + +" - I'm usually a day or two behind in my merge queue anyway, partly +because I get tons of pull requests in a short while and I just want +to get a feel for what's going on, and partly because I tend to do +pulls in waves of "ok, I'm going filesystems now, then I'll look at +drivers". + + - I do a *lot* of merges. I try to make them look good, and have +*explanations* in them. And if a merge conflict happens, I want to +know about them. + + - I want to have a gut feel about what goes into the tree when. I +know, for example, that "oops, we had a bug in ext4 that got +discovered only after the merge, and for a while there it didn't work +well with larger disks". When people complain, my job is often to have +that high-level view of "ok, you're hitting this known bug". If people +do back-merges, that basically pulls in my tree at some random point +that I'm not even aware of, and now you mixed up *other* peoples bugs +into your tree. + + - and somewhat most importantly (for me personally): backmerges make +history messy, and it can be a huge pain for me when I do merge +conflict resolution, or when other people do bisects etc. It's *much* +nicer in many ways (visually, and for bisect reasons) to try to have +as much independent development as possible." + +One more from LKML history: it can happen that your merge *actually* +breaks upstream because it refers to symbols which are being removed by +another, previous merge. So don't merge. + +6.) Avoid an excessive amount of senseless cross-merges. Think of +it this way: a merge appearing in the final git history has to mean +something, it has to say why it is there. So, having too many pointless +merges simply pollutes the history and devalues it. Instead, think of +a good point to do a cross merge, do it and *document* exactly why it is +there. + +7.) And while we're at it, you should *almost* *never* rebase your +tree. More so if it has gone public and people are possibly relying on +it to remain stable and basing their stuff on top - especially then +you're absolutely not allowed to rebase it anymore. But that's not that +problematic if you've adopted the incremental development model and your +tree is at least as well-cooked as in 1) above. + +IOW, "rebasing has other deeper problems too, like the fact that your +tree is no longer something that other people can depend on. That's not +a big issue for a new architecture, but it's a big issue going forward. +Which is why rebasing is generally even *worse* than back-merges (but +both are basically big "just don't do that"). + +So the rule for both rebasing and back-merging should be: + + - you should have damn good reasons for it, and you should document +them. + + - you should basically *never* rebase or back-merge random commits in +the merge window. That's *NEVER* a good idea. If you have a conflict, +ignore it. Explain it to me when you ask me to pull, but it is *my* job +to know "ok, I've pulled fiftynine different trees, and trees X and Y +end up conflicting, and this is how it got resolved". Seriously. + + - if you have some really long-lived development tree, and you want to +back-merge just to not be *too* far away, back-merge to actual releases. +Don't pull my master branch. Say "git merge v3.8" or something like +that, and then you write a good merge message that talks about *why* you +wanted to update to a new release." + +8.) After the maintainer has pulled, it is always a good idea to take a +look at the merge and verify it has happened as you've expected it to, +maybe even run your tests on it to double-check everything went fine. + +Further reading: Documentation/development-process/*
Signature · 1 line
1.8.1.3.535.ga923c31
Randy Dunlap
reviewerQuoted 102 lines · Borislav Petkov
From: Borislav Petkov <[email protected]>
Hold down some important points to pay attention to when preparing a pull request to upper-level maintainers and/or Linus. Based on a couple of agitated mails from Linus to maintainers and random crowd sitting around.
Signed-off-by Borislav Petkov <[email protected]>---
Ok,
so here's what I have. I took your message from yesterday and morphed/fleshed it out into a set of points to pay attention to when prepping a pull request. I also sampled some more rants from last year to get a couple more recurring issues.
I hope I've covered the most important points.
Thanks.
Documentation/SubmittingPullRequests | 148 +++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 Documentation/SubmittingPullRequestsDocumentation/SubmittingPullRequests new file +71
-0@@ -0,0 +1,148 @@ + Trees, merges and other hints for maintainers of all levels + =========================================================== + +... or how do I send my tree to Linus without him biting my head off. + + +This is a collection of hints, notes, suggestions and accepted practices +for sending pull requests to (other maintainers which then forward those +trees to) Linus. It is loosely based on Linus' friendly and polite hints +to maintainers on the Linux Kernel Mailing List and the idea behind it +is to document the most apparent do's and dont's, thus saving time and +money of everyone involved. + +Basically, pull requests and merge commits adhering to the guidelines +described below should establish certain practices which make +development history as presentable, useful and sensible as possible. + +People staring at it should be able to understand what went where, when +and why, without encountering senseless merge commits and internal +subsystem development state which don't have any bearing on the final, +cast-in-stone history. A second, not less important reason is tree +bisectability. + +Here we go: + +0.) Before asking any maintainer to pull a pile of patches, make damn +well sure that said pile is stable, works, and has been extensively, +thoroughly and to the best of your abilities, tested. There's absolutely +no reason in rushing half-cooked patches just because your manager says +so. Rule of thumb is: if the patches are so done that they're boringly +missing any issues or regressions and you've almost forgotten them in +linux-next, *then* you can send. + +1.) The patchset going to an upper level maintainer should NOT be based +on some random, potentially completely broken commit in the middle of a +merge window, or some other random point in the tree history. + +Tangential to that, it shouldn't contain back-merges - not to "next" +trees, and not to a "random commit of the day" in Linus' tree. + +Why, you ask? + +Linus: "Basically, I do not want people's development trees to worry +about some random crazy merge-window tree of the day. You should always +pick a good starting point that makes sense (where "makes sense" is very +much about "it's stable and well known" and just do your own thing. What +other people do should simply not concern you over-much. You are the +[ ... ] maintainer, and your job is not integration, it's to make sure +that *your* work is as stable and unsurprising as possible." + +2.) Write a sensible, human-readable mail message explaining in terms +understandable to outsiders what your patchset entails, maybe describe +the high-level big picture of where your patchset fits and why. And +do not use abbreviations - they might be clear to you and the people +working on your subsystem but not necessarily to the rest of the world. +Also, include the diffstat in that mail (git request-pull should take +care of all that nicely). + +3.) GPG-sign your pull request and put the high-level description you've +created into the signed tag. Of course, your key should be signed by +fellow developers who are in the chain of trust of the receiving end of +your pull request. + +4.) The URL of your pull request should contain the signed tag. Make +sure that URL is valid and externally accessible. This is especially +valid for the k.org crowd who get it wrong a *lot*. Also, people tend to +forget to push the signed tag. + +5.) THEN AND ONLY THEN do we start worrying about possible merge issues +your pull request could cause with upstream. It can be very helpful if +you look into and describe them in the pull request mail, maybe even do
Documentation/SubmittingPullRequests line 81
Quoted 10 lines
Documentation/SubmittingPullRequests new file +10
-0+an *example* merge. This merge won't normally be used but it is very +helpful to show the person doing the merge how to resolve possible +conflicts. + +Here's Linus counting the ways why you shouldn't make merges yourself: + +" - I'm usually a day or two behind in my merge queue anyway, partly +because I get tons of pull requests in a short while and I just want +to get a feel for what's going on, and partly because I tend to do +pulls in waves of "ok, I'm going filesystems now, then I'll look at
doing ?
Quoted 30 lines
Documentation/SubmittingPullRequests new file +30
-0+drivers". + + - I do a *lot* of merges. I try to make them look good, and have +*explanations* in them. And if a merge conflict happens, I want to +know about them. + + - I want to have a gut feel about what goes into the tree when. I +know, for example, that "oops, we had a bug in ext4 that got +discovered only after the merge, and for a while there it didn't work +well with larger disks". When people complain, my job is often to have +that high-level view of "ok, you're hitting this known bug". If people +do back-merges, that basically pulls in my tree at some random point +that I'm not even aware of, and now you mixed up *other* peoples bugs +into your tree. + + - and somewhat most importantly (for me personally): backmerges make +history messy, and it can be a huge pain for me when I do merge +conflict resolution, or when other people do bisects etc. It's *much* +nicer in many ways (visually, and for bisect reasons) to try to have +as much independent development as possible." + +One more from LKML history: it can happen that your merge *actually* +breaks upstream because it refers to symbols which are being removed by +another, previous merge. So don't merge. + +6.) Avoid an excessive amount of senseless cross-merges. Think of +it this way: a merge appearing in the final git history has to mean +something, it has to say why it is there. So, having too many pointless +merges simply pollutes the history and devalues it. Instead, think of +a good point to do a cross merge, do it and *document* exactly why it is
Documentation/SubmittingPullRequests line 121
Quoted 10 lines
Documentation/SubmittingPullRequests new file +10
-0+there. + +7.) And while we're at it, you should *almost* *never* rebase your +tree. More so if it has gone public and people are possibly relying on +it to remain stable and basing their stuff on top - especially then +you're absolutely not allowed to rebase it anymore. But that's not that +problematic if you've adopted the incremental development model and your +tree is at least as well-cooked as in 1) above. + +IOW, "rebasing has other deeper problems too, like the fact that your
missing ending '"' somewhere.
Documentation/SubmittingPullRequests line 132
Quoted 11 lines
Documentation/SubmittingPullRequests new file +11
-0+tree is no longer something that other people can depend on. That's not +a big issue for a new architecture, but it's a big issue going forward. +Which is why rebasing is generally even *worse* than back-merges (but +both are basically big "just don't do that"). + +So the rule for both rebasing and back-merging should be: + + - you should have damn good reasons for it, and you should document +them. + + - you should basically *never* rebase or back-merge random commits in
hm, sometimes it is backmerge and other times it is back-merge. Please be consistent.
Documentation/SubmittingPullRequests line 135
Quoted 3 lines
Documentation/SubmittingPullRequests new file +3
-0+the merge window. That's *NEVER* a good idea. If you have a conflict, +ignore it. Explain it to me when you ask me to pull, but it is *my* job +to know "ok, I've pulled fiftynine different trees, and trees X and Y
fifty-nine
Quoted 4 lines
Documentation/SubmittingPullRequests new file +3
-0+end up conflicting, and this is how it got resolved". Seriously. + + - if you have some really long-lived development tree, and you want to
Documentation/SubmittingPullRequests line 148
Quoted 10 lines
Documentation/SubmittingPullRequests new file +10
-0+back-merge just to not be *too* far away, back-merge to actual releases. +Don't pull my master branch. Say "git merge v3.8" or something like +that, and then you write a good merge message that talks about *why* you +wanted to update to a new release." + +8.) After the maintainer has pulled, it is always a good idea to take a +look at the merge and verify it has happened as you've expected it to, +maybe even run your tests on it to double-check everything went fine. + +Further reading: Documentation/development-process/*
Looks good and useful overall.
thanks,
Signature · 1 line
~Randy
Quoted 180 lines · Randy Dunlap
Quoted 102 lines · Borislav Petkov
From: Borislav Petkov <[email protected]>
Hold down some important points to pay attention to when preparing a pull request to upper-level maintainers and/or Linus. Based on a couple of agitated mails from Linus to maintainers and random crowd sitting around.
Signed-off-by Borislav Petkov <[email protected]>---
Ok,
so here's what I have. I took your message from yesterday and morphed/fleshed it out into a set of points to pay attention to when prepping a pull request. I also sampled some more rants from last year to get a couple more recurring issues.
I hope I've covered the most important points.
Thanks.
Documentation/SubmittingPullRequests | 148 +++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 Documentation/SubmittingPullRequestsDocumentation/SubmittingPullRequests new file +71
-0@@ -0,0 +1,148 @@ + Trees, merges and other hints for maintainers of all levels + =========================================================== + +... or how do I send my tree to Linus without him biting my head off. + + +This is a collection of hints, notes, suggestions and accepted practices +for sending pull requests to (other maintainers which then forward those +trees to) Linus. It is loosely based on Linus' friendly and polite hints +to maintainers on the Linux Kernel Mailing List and the idea behind it +is to document the most apparent do's and dont's, thus saving time and +money of everyone involved. + +Basically, pull requests and merge commits adhering to the guidelines +described below should establish certain practices which make +development history as presentable, useful and sensible as possible. + +People staring at it should be able to understand what went where, when +and why, without encountering senseless merge commits and internal +subsystem development state which don't have any bearing on the final, +cast-in-stone history. A second, not less important reason is tree +bisectability. + +Here we go: + +0.) Before asking any maintainer to pull a pile of patches, make damn +well sure that said pile is stable, works, and has been extensively, +thoroughly and to the best of your abilities, tested. There's absolutely +no reason in rushing half-cooked patches just because your manager says +so. Rule of thumb is: if the patches are so done that they're boringly +missing any issues or regressions and you've almost forgotten them in +linux-next, *then* you can send. + +1.) The patchset going to an upper level maintainer should NOT be based +on some random, potentially completely broken commit in the middle of a +merge window, or some other random point in the tree history. + +Tangential to that, it shouldn't contain back-merges - not to "next" +trees, and not to a "random commit of the day" in Linus' tree. + +Why, you ask? + +Linus: "Basically, I do not want people's development trees to worry +about some random crazy merge-window tree of the day. You should always +pick a good starting point that makes sense (where "makes sense" is very +much about "it's stable and well known" and just do your own thing. What +other people do should simply not concern you over-much. You are the +[ ... ] maintainer, and your job is not integration, it's to make sure +that *your* work is as stable and unsurprising as possible." + +2.) Write a sensible, human-readable mail message explaining in terms +understandable to outsiders what your patchset entails, maybe describe +the high-level big picture of where your patchset fits and why. And +do not use abbreviations - they might be clear to you and the people +working on your subsystem but not necessarily to the rest of the world. +Also, include the diffstat in that mail (git request-pull should take +care of all that nicely). + +3.) GPG-sign your pull request and put the high-level description you've +created into the signed tag. Of course, your key should be signed by +fellow developers who are in the chain of trust of the receiving end of +your pull request. + +4.) The URL of your pull request should contain the signed tag. Make +sure that URL is valid and externally accessible. This is especially +valid for the k.org crowd who get it wrong a *lot*. Also, people tend to +forget to push the signed tag. + +5.) THEN AND ONLY THEN do we start worrying about possible merge issues +your pull request could cause with upstream. It can be very helpful if +you look into and describe them in the pull request mail, maybe even doDocumentation/SubmittingPullRequests line 81
Quoted 10 lines
Documentation/SubmittingPullRequests new file +10
-0+an *example* merge. This merge won't normally be used but it is very +helpful to show the person doing the merge how to resolve possible +conflicts. + +Here's Linus counting the ways why you shouldn't make merges yourself: + +" - I'm usually a day or two behind in my merge queue anyway, partly +because I get tons of pull requests in a short while and I just want +to get a feel for what's going on, and partly because I tend to do +pulls in waves of "ok, I'm going filesystems now, then I'll look atdoing ?
Quoted 30 lines
Documentation/SubmittingPullRequests new file +30
-0+drivers". + + - I do a *lot* of merges. I try to make them look good, and have +*explanations* in them. And if a merge conflict happens, I want to +know about them. + + - I want to have a gut feel about what goes into the tree when. I +know, for example, that "oops, we had a bug in ext4 that got +discovered only after the merge, and for a while there it didn't work +well with larger disks". When people complain, my job is often to have +that high-level view of "ok, you're hitting this known bug". If people +do back-merges, that basically pulls in my tree at some random point +that I'm not even aware of, and now you mixed up *other* peoples bugs +into your tree. + + - and somewhat most importantly (for me personally): backmerges make +history messy, and it can be a huge pain for me when I do merge +conflict resolution, or when other people do bisects etc. It's *much* +nicer in many ways (visually, and for bisect reasons) to try to have +as much independent development as possible." + +One more from LKML history: it can happen that your merge *actually* +breaks upstream because it refers to symbols which are being removed by +another, previous merge. So don't merge. + +6.) Avoid an excessive amount of senseless cross-merges. Think of +it this way: a merge appearing in the final git history has to mean +something, it has to say why it is there. So, having too many pointless +merges simply pollutes the history and devalues it. Instead, think of +a good point to do a cross merge, do it and *document* exactly why it isDocumentation/SubmittingPullRequests line 121
Quoted 10 lines
Documentation/SubmittingPullRequests new file +10
-0+there. + +7.) And while we're at it, you should *almost* *never* rebase your +tree. More so if it has gone public and people are possibly relying on +it to remain stable and basing their stuff on top - especially then +you're absolutely not allowed to rebase it anymore. But that's not that +problematic if you've adopted the incremental development model and your +tree is at least as well-cooked as in 1) above. + +IOW, "rebasing has other deeper problems too, like the fact that yourmissing ending '"' somewhere.
Documentation/SubmittingPullRequests line 132
Quoted 11 lines
Documentation/SubmittingPullRequests new file +11
-0+tree is no longer something that other people can depend on. That's not +a big issue for a new architecture, but it's a big issue going forward. +Which is why rebasing is generally even *worse* than back-merges (but +both are basically big "just don't do that"). + +So the rule for both rebasing and back-merging should be: + + - you should have damn good reasons for it, and you should document +them. + + - you should basically *never* rebase or back-merge random commits inhm, sometimes it is backmerge and other times it is back-merge. Please be consistent.
Documentation/SubmittingPullRequests line 135
Quoted 3 lines
Documentation/SubmittingPullRequests new file +3
-0+the merge window. That's *NEVER* a good idea. If you have a conflict, +ignore it. Explain it to me when you ask me to pull, but it is *my* job +to know "ok, I've pulled fiftynine different trees, and trees X and Yfifty-nine
Quoted 15 lines
Quoted 4 lines
Documentation/SubmittingPullRequests new file +3
-0+end up conflicting, and this is how it got resolved". Seriously. + + - if you have some really long-lived development tree, and you want toDocumentation/SubmittingPullRequests line 148
Quoted 10 lines
Documentation/SubmittingPullRequests new file +10
-0+back-merge just to not be *too* far away, back-merge to actual releases. +Don't pull my master branch. Say "git merge v3.8" or something like +that, and then you write a good merge message that talks about *why* you +wanted to update to a new release." + +8.) After the maintainer has pulled, it is always a good idea to take a +look at the merge and verify it has happened as you've expected it to, +maybe even run your tests on it to double-check everything went fine. + +Further reading: Documentation/development-process/*Looks good and useful overall.
Yeah, thanks for looking at this.
Most of those above are Linus quotes so I didn't look at language issues there - their absolute correctness is not even that important as long as the message of do's and dont's for maintainers comes across correctly and people understand the bulk of it.
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--Quoted 45 lines · Randy Dunlap
Quoted 4 lines · Borislav Petkov
From: Borislav Petkov <[email protected]>
Hold down some important points to pay attention to when preparing a pull request to upper-level maintainers and/or Linus. Based on a
couple
Quoted 11 lines
of agitated mails from Linus to maintainers and random crowd sitting around.
Signed-off-by Borislav Petkov <[email protected]>---
Ok,
so here's what I have. I took your message from yesterday and morphed/fleshed it out into a set of points to pay attention to when prepping a pull request. I also sampled some more rants from last
year
Quoted 7 lines
to get a couple more recurring issues.
I hope I've covered the most important points.
Thanks.
Documentation/SubmittingPullRequests | 148+++++++++++++++++++++++++++++++++++
Review
Quoted 4 lines
1 file changed, 148 insertions(+) create mode 100644 Documentation/SubmittingPullRequests(quoted diff) +0
-0b/Documentation/SubmittingPullRequests
Documentation/SubmittingPullRequests line 4
Quoted 9 lines
new file mode 100644
index 000000000000..d123745e0cf5Documentation/SubmittingPullRequests new file +4
-0@@ -0,0 +1,148 @@ + Trees, merges and other hints for maintainers of all levels + =========================================================== + +... or how do I send my tree to Linus without him biting my headoff.
Documentation/SubmittingPullRequests
Quoted 3 lines
Documentation/SubmittingPullRequests new file +3
-0+ + +This is a collection of hints, notes, suggestions and acceptedpractices
Quoted 9 lines
Documentation/SubmittingPullRequests line 8
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+for sending pull requests to (other maintainers which then forwardthose
Documentation/SubmittingPullRequests line 9
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+trees to) Linus. It is loosely based on Linus' friendly and politehints
Documentation/SubmittingPullRequests line 10
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+to maintainers on the Linux Kernel Mailing List and the ideabehind it
Documentation/SubmittingPullRequests line 11
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+is to document the most apparent do's and dont's, thus saving timeand
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+money of everyone involved.
"Loosely based on Linus's hints to maintainers on the Linux Kernel Mailing List."
The rest is throat clearing.
Quoted 5 lines
Documentation/SubmittingPullRequests line 13
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+Basically, pull requests and merge commits adhering to theguidelines
Documentation/SubmittingPullRequests line 15
Quoted 2 lines
Documentation/SubmittingPullRequests new file +2
-0+described below should establish certain practices which make +development history as presentable, useful and sensible aspossible.
Quoted 8 lines
Documentation/SubmittingPullRequests line 17
Quoted 2 lines
Documentation/SubmittingPullRequests new file +2
-0+ +People staring at it should be able to understand what went where,when
Documentation/SubmittingPullRequests line 19
Quoted 2 lines
Documentation/SubmittingPullRequests new file +2
-0+and why, without encountering senseless merge commits and internal +subsystem development state which don't have any bearing on thefinal,
Documentation/SubmittingPullRequests line 22
Quoted 2 lines
Documentation/SubmittingPullRequests new file +2
-0+cast-in-stone history. A second, not less important reason is tree +bisectability.
That can be replaced with:
Pull requests should ensure the upstream tree is bisectable, and present development history that clearly shows what went where, when and why, without extra merge commits and internal subsystem development.
Quoted 1 line
Documentation/SubmittingPullRequests line 24
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+Here we go:
Ahem.
Quoted 4 lines
Documentation/SubmittingPullRequests line 23
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+0.) Before asking any maintainer to pull a pile of patches, makedamn
Documentation/SubmittingPullRequests line 24
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+well sure that said pile is stable, works, and has beenextensively,
Quoted 9 lines
Documentation/SubmittingPullRequests line 25
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+thoroughly and to the best of your abilities, tested. There'sabsolutely
Documentation/SubmittingPullRequests line 26
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+no reason in rushing half-cooked patches just because your managersays
Documentation/SubmittingPullRequests line 27
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+so. Rule of thumb is: if the patches are so done that they'reboringly
Documentation/SubmittingPullRequests line 28
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+missing any issues or regressions and you've almost forgotten themin
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+linux-next, *then* you can send.
As a developer, this is where I'd stop reading. (Because nobody ever has an actual bug that needs to be fixed in a timely manner.)
This says to a maintainer "you are careless and your code sucks". It doesn't say "any user interface that goes upstream is cast in stone and you'll regret getting it wrong almost immediately but it's too late!" Nor "cry wolf and they'll stop paying attention to you". Nor "a thousand experienced developers will find bugs you couldn't find, so making them find bugs you DIDN'T find but could have makes you look like an idiot"...
Quoted 9 lines
Documentation/SubmittingPullRequests line 30
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+1.) The patchset going to an upper level maintainer should NOT bebased
Documentation/SubmittingPullRequests line 31
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+on some random, potentially completely broken commit in the middleof a
Documentation/SubmittingPullRequests
Quoted 3 lines
Documentation/SubmittingPullRequests new file +3
-0+merge window, or some other random point in the tree history. + +Tangential to that, it shouldn't contain back-merges - not to"next"
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+trees, and not to a "random commit of the day" in Linus' tree.
Could you do positive advice first instead of negative advice? "Base your tree on a release version, and never re-pull between releases without a damn good reason."
Not "don't do this, don't do this, don't do this" and make them figure out what they _should_ do by process of elimination.
Quoted 19 lines
Documentation/SubmittingPullRequests
Quoted 3 lines
Documentation/SubmittingPullRequests new file +3
-0+Why, you ask? + +Linus: "Basically, I do not want people's development trees toworry
Documentation/SubmittingPullRequests line 39
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+about some random crazy merge-window tree of the day. You shouldalways
Documentation/SubmittingPullRequests line 40
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+pick a good starting point that makes sense (where "makes sense"is very
Documentation/SubmittingPullRequests line 41
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+much about "it's stable and well known" and just do your ownthing. What
Documentation/SubmittingPullRequests line 42
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+other people do should simply not concern you over-much. You arethe
Documentation/SubmittingPullRequests line 43
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+[ ... ] maintainer, and your job is not integration, it's to makesure
Documentation/SubmittingPullRequests
Quoted 3 lines
Documentation/SubmittingPullRequests new file +3
-0+that *your* work is as stable and unsurprising as possible." + +2.) Write a sensible, human-readable mail message explaining interms
Documentation/SubmittingPullRequests line 47
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+understandable to outsiders what your patchset entails, maybe
Quoted 9 lines
describe
Documentation/SubmittingPullRequests line 49
Quoted 2 lines
Documentation/SubmittingPullRequests new file +2
-0+the high-level big picture of where your patchset fits and why. And +do not use abbreviations - they might be clear to you and thepeople
Documentation/SubmittingPullRequests line 50
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+working on your subsystem but not necessarily to the rest of theworld.
Documentation/SubmittingPullRequests line 51
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+Also, include the diffstat in that mail (git request-pull shouldtake
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+care of all that nicely).
I read that and went "surely [PATCH 0/X] is mentioned in SubmittingPatches, but apparently that file's been bikeshedded to death. ("Include PATCH in the subject" is item 11 in the list. Oy.)
Was this new file created because the old file is considered unfixable?
Quoted 7 lines
Documentation/SubmittingPullRequests line 53
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+3.) GPG-sign your pull request and put the high-level descriptionyou've
Documentation/SubmittingPullRequests line 54
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+created into the signed tag. Of course, your key should be signedby
Documentation/SubmittingPullRequests line 55
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+fellow developers who are in the chain of trust of the receivingend of
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+your pull request.
If you haven't got a GPG key signed by the in-crowd of kernel developers, we don't want to hear from you because you're not one of us?
Quoted 7 lines
Documentation/SubmittingPullRequests line 57
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+4.) The URL of your pull request should contain the signed tag.Make
Documentation/SubmittingPullRequests line 58
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+sure that URL is valid and externally accessible. This isespecially
Documentation/SubmittingPullRequests line 59
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+valid for the k.org crowd who get it wrong a *lot*. Also, peopletend to
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+forget to push the signed tag.
Could you provide an example of how to do it right for people who aren't already intimately familiar with a tool with a notoriously horrible user interface, even in the context of unix?
Quoted 10 lines
Documentation/SubmittingPullRequests line 61
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+5.) THEN AND ONLY THEN do we start worrying about possible mergeissues
Documentation/SubmittingPullRequests line 62
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+your pull request could cause with upstream. It can be veryhelpful if
Documentation/SubmittingPullRequests line 63
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+you look into and describe them in the pull request mail, maybeeven do
Documentation/SubmittingPullRequests line 64
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+an *example* merge. This merge won't normally be used but it isvery
Documentation/SubmittingPullRequests line 74
Quoted 2 lines
Documentation/SubmittingPullRequests new file +2
-0+helpful to show the person doing the merge how to resolve possible +conflicts.
What linus basically said is he wants to resolve the merge conflicts himself because it's educational for him to know how the systems interact. (If the people you ask to pull want you to resolve a conflict, they'll tell you.)
I didn't get that from your paragraph.
Quoted 4 lines
Documentation/SubmittingPullRequests line 67
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+Here's Linus counting the ways why you shouldn't make mergesyourself:
Documentation/SubmittingPullRequests line 69
Quoted 2 lines
Documentation/SubmittingPullRequests new file +2
-0+ +" - I'm usually a day or two behind in my merge queue anyway,
Quoted 9 lines
partly
Documentation/SubmittingPullRequests line 70
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+because I get tons of pull requests in a short while and I justwant
Documentation/SubmittingPullRequests line 81
Quoted 2 lines
Documentation/SubmittingPullRequests new file +2
-0+to get a feel for what's going on, and partly because I tend to do +pulls in waves of "ok, I'm going filesystems now, then I'll look atdoing ?
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+drivers".
Given that he's quoting linus, it would be "[doing]".
Quoted 21 lines
Documentation/SubmittingPullRequests
Quoted 8 lines
Documentation/SubmittingPullRequests new file +8
-0+ + - I do a *lot* of merges. I try to make them look good, and have +*explanations* in them. And if a merge conflict happens, I want to +know about them. + + - I want to have a gut feel about what goes into the tree when. I +know, for example, that "oops, we had a bug in ext4 that got +discovered only after the merge, and for a while there it didn'twork
Documentation/SubmittingPullRequests line 82
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+well with larger disks". When people complain, my job is often tohave
Documentation/SubmittingPullRequests line 83
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+that high-level view of "ok, you're hitting this known bug". Ifpeople
Documentation/SubmittingPullRequests line 84
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+do back-merges, that basically pulls in my tree at some randompoint
Documentation/SubmittingPullRequests line 85
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+that I'm not even aware of, and now you mixed up *other* peoplesbugs
Documentation/SubmittingPullRequests
Quoted 3 lines
Documentation/SubmittingPullRequests new file +3
-0+into your tree. + + - and somewhat most importantly (for me personally): backmergesmake
Quoted 6 lines
Documentation/SubmittingPullRequests line 90
Quoted 2 lines
Documentation/SubmittingPullRequests new file +2
-0+history messy, and it can be a huge pain for me when I do merge +conflict resolution, or when other people do bisects etc. It's*much*
Documentation/SubmittingPullRequests line 91
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+nicer in many ways (visually, and for bisect reasons) to try tohave
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+as much independent development as possible."
For long quoted sections like this, is there a way to indent them or something? A quote character at the beginning and another at the end isn't much help for 4 paragraphs that internally contain quote characters (and the first paragraph of which ends with one).
Quoted 5 lines
Documentation/SubmittingPullRequests line 93
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+One more from LKML history: it can happen that your merge*actually*
Documentation/SubmittingPullRequests line 94
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+breaks upstream because it refers to symbols which are beingremoved by
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+another, previous merge. So don't merge.
Your branch you submit for pulling should not contain merges. That doesn't mean you can't have a _separate_ branch that you merge and track upstream development with.
You've never mentioned "git help cherry-pick" so far...
Quoted 9 lines
Documentation/SubmittingPullRequests
Quoted 3 lines
Documentation/SubmittingPullRequests new file +3
-0+6.) Avoid an excessive amount of senseless cross-merges. Think of +it this way: a merge appearing in the final git history has to mean +something, it has to say why it is there. So, having too manypointless
Documentation/SubmittingPullRequests line 99
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+merges simply pollutes the history and devalues it. Instead, thinkof
Documentation/SubmittingPullRequests line 100
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+a good point to do a cross merge, do it and *document* exactly whyit is
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+there.
So "don't merge", and here's another "don't merge". (And you don't say how a cross-merge differs from any other kind of merge.)
The tree you submit upstream should not include unnecessary merge commits. Merging back upstream will usually introduce a merge commit where the maintainer gets to summarize and comment on your work. If you are not that maintainer, put your summary in your pull request and let them make the merge commit.
Is that the point you're trying to make?
Quoted 1 line
Documentation/SubmittingPullRequests line 102
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+7.) And while we're at it,
Throat clearing.
Quoted 9 lines
Documentation/SubmittingPullRequests line 104
Quoted 2 lines
Documentation/SubmittingPullRequests new file +2
-0+you should *almost* *never* rebase your +tree. More so if it has gone public and people are possiblyrelying on
Documentation/SubmittingPullRequests line 106
Quoted 2 lines
Documentation/SubmittingPullRequests new file +2
-0+it to remain stable and basing their stuff on top - especially then +you're absolutely not allowed to rebase it anymore. But that's notthat
Documentation/SubmittingPullRequests line 107
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+problematic if you've adopted the incremental development modeland your
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+tree is at least as well-cooked as in 1) above.
You can always start a new branch and cherry pick clean changes on top of it.
Quoted 12 lines
Documentation/SubmittingPullRequests line 109
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+IOW, "rebasing has other deeper problems too, like the fact thatyour
missing ending '"' somewhere.
Documentation/SubmittingPullRequests line 110
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+tree is no longer something that other people can depend on.That's not
Documentation/SubmittingPullRequests line 111
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+a big issue for a new architecture, but it's a big issue goingforward.
Documentation/SubmittingPullRequests line 112
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+Which is why rebasing is generally even *worse* than back-merges(but
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+both are basically big "just don't do that").
All of this stuff about rebasing boils down to:
If you rewrite published history, you screw up anybody who's pulled from you. (Git 101.) Doing that to linux maintainers means they stop listening to you. So never rebase published branches, create a new branch instead.
Quoted 12 lines
Documentation/SubmittingPullRequests
Quoted 3 lines
Documentation/SubmittingPullRequests new file +3
-0+So the rule for both rebasing and back-merging should be: + + - you should have damn good reasons for it, and you shoulddocument
Documentation/SubmittingPullRequests
Quoted 3 lines
Documentation/SubmittingPullRequests new file +3
-0+them. + + - you should basically *never* rebase or back-merge randomcommits in
hm, sometimes it is backmerge and other times it is back-merge. Please be consistent.
Quoted 10 lines
Documentation/SubmittingPullRequests line 120
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+the merge window. That's *NEVER* a good idea. If you have aconflict,
Documentation/SubmittingPullRequests line 121
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+ignore it. Explain it to me when you ask me to pull, but it is*my* job
Documentation/SubmittingPullRequests line 122
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+to know "ok, I've pulled fiftynine different trees, and trees Xand Y
fifty-nine
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+end up conflicting, and this is how it got resolved". Seriously.
I.E. Linus (or the subsystem maintainer) usually want to resolve their own conflicts so they can see why it conflicted, and when they want you to do it instead they'll let you know.
Quoted 8 lines
Documentation/SubmittingPullRequests line 124
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+ - if you have some really long-lived development tree, and youwant to
Documentation/SubmittingPullRequests line 125
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+back-merge just to not be *too* far away, back-merge to actualreleases.
Documentation/SubmittingPullRequests line 127
Quoted 2 lines
Documentation/SubmittingPullRequests new file +2
-0+Don't pull my master branch. Say "git merge v3.8" or something like +that, and then you write a good merge message that talks about*why* you
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+wanted to update to a new release."
Why is "create a new branch instead" (as stated above) wrong here? Isn't that what the realtime guys do?
Quoted 11 lines
Documentation/SubmittingPullRequests line 129
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+8.) After the maintainer has pulled, it is always a good idea totake a
Documentation/SubmittingPullRequests line 130
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+look at the merge and verify it has happened as you've expected itto,
Documentation/SubmittingPullRequests line 131
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+maybe even run your tests on it to double-check everything wentfine.
Documentation/SubmittingPullRequests line 133
Quoted 3 lines
Documentation/SubmittingPullRequests new file +2
-0+ +Further reading: Documentation/development-process/*Looks good and useful overall.
Looks longer than necessary to me, and if we have a Documentation/development-process why isn't this going in there instead of at the top level? (Although really why isn't it just another couple bullet points under submittingpatches?)
Rob
Randy Dunlap
reviewerQuoted 24 lines · Rob Landley
Quoted 14 lines · Randy Dunlap
Quoted 12 lines · Borislav Petkov
From: Borislav Petkov <[email protected]>
Documentation/SubmittingPullRequests | 148 +++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 Documentation/SubmittingPullRequestsDocumentation/SubmittingPullRequests new file +0
-0@@ -0,0 +1,148 @@Quoted 6 lines
Documentation/SubmittingPullRequests line 39
Quoted 6 lines
Documentation/SubmittingPullRequests new file +6
-0+1.) The patchset going to an upper level maintainer should NOT be based +on some random, potentially completely broken commit in the middle of a +merge window, or some other random point in the tree history. + +Tangential to that, it shouldn't contain back-merges - not to "next" +trees, and not to a "random commit of the day" in Linus' tree.Could you do positive advice first instead of negative advice? "Base your tree on a release version, and never re-pull between releases without a damn good reason."
Quoted 1 line
Not "don't do this, don't do this, don't do this" and make them figure out what they _should_ do by process of elimination.
agreed.
Quoted 9 lines
Quoted 9 lines
Documentation/SubmittingPullRequests line 81
Quoted 6 lines
Documentation/SubmittingPullRequests new file +6
-0+Here's Linus counting the ways why you shouldn't make merges yourself: + +" - I'm usually a day or two behind in my merge queue anyway, partly +because I get tons of pull requests in a short while and I just want +to get a feel for what's going on, and partly because I tend to do +pulls in waves of "ok, I'm going filesystems now, then I'll look atdoing ?
Quoted 3 lines
Quoted 1 line
Documentation/SubmittingPullRequests line 82
Quoted 1 line
Documentation/SubmittingPullRequests new file +1
-0+drivers".Given that he's quoting linus, it would be "[doing]".
ack.
Quoted 10 lines
Quoted 8 lines
Documentation/SubmittingPullRequests line 148
Quoted 6 lines
Documentation/SubmittingPullRequests new file +5
-0+8.) After the maintainer has pulled, it is always a good idea to take a +look at the merge and verify it has happened as you've expected it to, +maybe even run your tests on it to double-check everything went fine. + +Further reading: Documentation/development-process/*Looks good and useful overall.
Looks longer than necessary to me, and if we have a
Documentation/development-processwhy isn't this going in there instead of at the top level? (Although really why isn't it just another couple bullet points under submittingpatches?)
Well, yes, my first thought was actually why not update SubmittingPatches instead of add this new file.
Signature · 1 line
~Randy