1 <?xml version=
"1.0" encoding=
"UTF-8"?>
2 <!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.1//EN"
3 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
4 <html xmlns=
"http://www.w3.org/1999/xhtml" xml:
lang=
"en">
6 <meta http-equiv=
"Content-Type" content=
"application/xhtml+xml; charset=UTF-8" />
7 <meta name=
"generator" content=
"AsciiDoc 10.2.0" />
8 <title>Reviewing Patches in the Git Project
</title>
9 <style type=
"text/css">
10 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
14 font-family: Georgia,serif;
18 h1, h2, h3, h4, h5, h6,
19 div.title, caption.title,
20 thead, p.table.header,
22 #author, #revnumber, #revdate, #revremark,
24 font-family: Arial,Helvetica,sans-serif;
28 margin:
1em
5%
1em
5%;
33 text-decoration: underline;
49 h1, h2, h3, h4, h5, h6 {
57 border-bottom:
2px solid silver;
77 border:
1px solid silver;
88 ul
> li { color: #aaa; }
89 ul
> li
> * { color: black; }
91 .monospaced, code, pre {
92 font-family:
"Courier New", Courier, monospace;
99 white-space: pre-wrap;
109 #revnumber, #revdate, #revremark {
114 border-top:
2px solid silver;
120 padding-bottom:
0.5em;
124 padding-bottom:
0.5em;
129 margin-bottom:
1.5em;
131 div.imageblock, div.exampleblock, div.verseblock,
132 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
133 div.admonitionblock {
135 margin-bottom:
1.5em;
137 div.admonitionblock {
139 margin-bottom:
2.0em;
144 div.content { /* Block element content. */
148 /* Block element titles. */
149 div.title, caption.title {
154 margin-bottom:
0.5em;
160 td div.title:first-child {
163 div.content div.title:first-child {
166 div.content + div.title {
170 div.sidebarblock
> div.content {
172 border:
1px solid #dddddd;
173 border-left:
4px solid #f0f0f0;
177 div.listingblock
> div.content {
178 border:
1px solid #dddddd;
179 border-left:
5px solid #f0f0f0;
184 div.quoteblock, div.verseblock {
188 border-left:
5px solid #f0f0f0;
192 div.quoteblock
> div.attribution {
197 div.verseblock
> pre.content {
198 font-family: inherit;
201 div.verseblock
> div.attribution {
205 /* DEPRECATED: Pre version
8.2.7 verse style literal block. */
206 div.verseblock + div.attribution {
210 div.admonitionblock .icon {
214 text-decoration: underline;
216 padding-right:
0.5em;
218 div.admonitionblock td.content {
220 border-left:
3px solid #dddddd;
223 div.exampleblock
> div.content {
224 border-left:
3px solid #dddddd;
228 div.imageblock div.content { padding-left:
0; }
229 span.image img { border-style: none; vertical-align: text-bottom; }
230 a.image:visited { color: white; }
234 margin-bottom:
0.8em;
247 list-style-position: outside;
250 list-style-type: decimal;
253 list-style-type: lower-alpha;
256 list-style-type: upper-alpha;
259 list-style-type: lower-roman;
262 list-style-type: upper-roman;
265 div.compact ul, div.compact ol,
266 div.compact p, div.compact p,
267 div.compact div, div.compact div {
269 margin-bottom:
0.1em;
281 margin-bottom:
0.8em;
284 padding-bottom:
15px;
286 dt.hdlist1.strong, td.hdlist1.strong {
292 padding-right:
0.8em;
298 div.hdlist.compact tr {
307 .footnote, .footnoteref {
311 span.footnote, span.footnoteref {
312 vertical-align: super;
316 margin:
20px
0 20px
0;
320 #footnotes div.footnote {
326 border-top:
1px solid silver;
335 padding-right:
0.5em;
336 padding-bottom:
0.3em;
344 #footer-badges { display: none; }
348 margin-bottom:
2.5em;
356 margin-bottom:
0.1em;
359 div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
376 span.aqua { color: aqua; }
377 span.black { color: black; }
378 span.blue { color: blue; }
379 span.fuchsia { color: fuchsia; }
380 span.gray { color: gray; }
381 span.green { color: green; }
382 span.lime { color: lime; }
383 span.maroon { color: maroon; }
384 span.navy { color: navy; }
385 span.olive { color: olive; }
386 span.purple { color: purple; }
387 span.red { color: red; }
388 span.silver { color: silver; }
389 span.teal { color: teal; }
390 span.white { color: white; }
391 span.yellow { color: yellow; }
393 span.aqua-background { background: aqua; }
394 span.black-background { background: black; }
395 span.blue-background { background: blue; }
396 span.fuchsia-background { background: fuchsia; }
397 span.gray-background { background: gray; }
398 span.green-background { background: green; }
399 span.lime-background { background: lime; }
400 span.maroon-background { background: maroon; }
401 span.navy-background { background: navy; }
402 span.olive-background { background: olive; }
403 span.purple-background { background: purple; }
404 span.red-background { background: red; }
405 span.silver-background { background: silver; }
406 span.teal-background { background: teal; }
407 span.white-background { background: white; }
408 span.yellow-background { background: yellow; }
410 span.big { font-size:
2em; }
411 span.small { font-size:
0.6em; }
413 span.underline { text-decoration: underline; }
414 span.overline { text-decoration: overline; }
415 span.line-through { text-decoration: line-through; }
417 div.unbreakable { page-break-inside: avoid; }
427 margin-bottom:
1.5em;
429 div.tableblock
> table {
430 border:
3px solid #
527bbd;
432 thead, p.table.header {
439 /* Because the table frame attribute is overridden by CSS in most browsers. */
440 div.tableblock
> table[
frame=
"void"] {
443 div.tableblock
> table[
frame=
"hsides"] {
444 border-left-style: none;
445 border-right-style: none;
447 div.tableblock
> table[
frame=
"vsides"] {
448 border-top-style: none;
449 border-bottom-style: none;
460 margin-bottom:
1.5em;
462 thead, p.tableblock.header {
473 border-color: #
527bbd;
474 border-collapse: collapse;
476 th.tableblock, td.tableblock {
480 border-color: #
527bbd;
483 table.tableblock.frame-topbot {
484 border-left-style: hidden;
485 border-right-style: hidden;
487 table.tableblock.frame-sides {
488 border-top-style: hidden;
489 border-bottom-style: hidden;
491 table.tableblock.frame-none {
492 border-style: hidden;
495 th.tableblock.halign-left, td.tableblock.halign-left {
498 th.tableblock.halign-center, td.tableblock.halign-center {
501 th.tableblock.halign-right, td.tableblock.halign-right {
505 th.tableblock.valign-top, td.tableblock.valign-top {
508 th.tableblock.valign-middle, td.tableblock.valign-middle {
509 vertical-align: middle;
511 th.tableblock.valign-bottom, td.tableblock.valign-bottom {
512 vertical-align: bottom;
523 padding-bottom:
0.5em;
524 border-top:
2px solid silver;
525 border-bottom:
2px solid silver;
530 body.manpage div.sectionbody {
535 body.manpage div#toc { display: none; }
540 <script type=
"text/javascript">
542 var asciidoc = { // Namespace.
544 /////////////////////////////////////////////////////////////////////
545 // Table Of Contents generator
546 /////////////////////////////////////////////////////////////////////
548 /* Author: Mihai Bazon, September
2002
549 * http://students.infoiasi.ro/~mishoo
551 * Table Of Content generator
554 * Feel free to use this script under the terms of the GNU General Public
555 * License, as long as you do not remove or alter this notice.
558 /* modified by Troy D. Hanson, September
2006. License: GPL */
559 /* modified by Stuart Rackham,
2006,
2009. License: GPL */
562 toc: function (toclevels) {
564 function getText(el) {
566 for (var i = el.firstChild; i != null; i = i.nextSibling) {
567 if (i.nodeType ==
3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
569 else if (i.firstChild != null)
575 function TocEntry(el, text, toclevel) {
578 this.toclevel = toclevel;
581 function tocEntries(el, toclevels) {
582 var result = new Array;
583 var re = new RegExp('[hH]([
1-'+(toclevels+
1)+'])');
584 // Function that scans the DOM tree for header elements (the DOM2
585 // nodeIterator API would be a better technique but not supported by all
587 var iterate = function (el) {
588 for (var i = el.firstChild; i != null; i = i.nextSibling) {
589 if (i.nodeType ==
1 /* Node.ELEMENT_NODE */) {
590 var mo = re.exec(i.tagName);
591 if (mo && (i.getAttribute(
"class") || i.getAttribute(
"className")) !=
"float") {
592 result[result.length] = new TocEntry(i, getText(i), mo[
1]-
1);
602 var toc = document.getElementById(
"toc");
607 // Delete existing TOC entries in case we're reloading the TOC.
608 var tocEntriesToRemove = [];
610 for (i =
0; i < toc.childNodes.length; i++) {
611 var entry = toc.childNodes[i];
612 if (entry.nodeName.toLowerCase() == 'div'
613 && entry.getAttribute(
"class")
614 && entry.getAttribute(
"class").match(/^toclevel/))
615 tocEntriesToRemove.push(entry);
617 for (i =
0; i < tocEntriesToRemove.length; i++) {
618 toc.removeChild(tocEntriesToRemove[i]);
621 // Rebuild TOC entries.
622 var entries = tocEntries(document.getElementById(
"content"), toclevels);
623 for (var i =
0; i < entries.length; ++i) {
624 var entry = entries[i];
625 if (entry.element.id ==
"")
626 entry.element.id =
"_toc_" + i;
627 var a = document.createElement(
"a");
628 a.href =
"#" + entry.element.id;
629 a.appendChild(document.createTextNode(entry.text));
630 var div = document.createElement(
"div");
632 div.className =
"toclevel" + entry.toclevel;
633 toc.appendChild(div);
635 if (entries.length ==
0)
636 toc.parentNode.removeChild(toc);
640 /////////////////////////////////////////////////////////////////////
641 // Footnotes generator
642 /////////////////////////////////////////////////////////////////////
644 /* Based on footnote generation code from:
645 * http://www.brandspankingnew.net/archive/
2005/
07/format_footnote.html
648 footnotes: function () {
649 // Delete existing footnote entries in case we're reloading the footnodes.
651 var noteholder = document.getElementById(
"footnotes");
655 var entriesToRemove = [];
656 for (i =
0; i < noteholder.childNodes.length; i++) {
657 var entry = noteholder.childNodes[i];
658 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute(
"class") ==
"footnote")
659 entriesToRemove.push(entry);
661 for (i =
0; i < entriesToRemove.length; i++) {
662 noteholder.removeChild(entriesToRemove[i]);
665 // Rebuild footnote entries.
666 var cont = document.getElementById(
"content");
667 var spans = cont.getElementsByTagName(
"span");
670 for (i=
0; i
<spans.length; i++) {
671 if (spans[i].className ==
"footnote") {
673 var note = spans[i].getAttribute(
"data-note");
675 // Use [\s\S] in place of . so multi-line matches work.
676 // Because JavaScript has no s (dotall) regex flag.
677 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[
1];
679 "[<a id='_footnoteref_" + n +
"' href='#_footnote_" + n +
680 "' title='View footnote' class='footnote'>" + n +
"</a>]";
681 spans[i].setAttribute(
"data-note", note);
683 noteholder.innerHTML +=
684 "<div class='footnote' id='_footnote_" + n +
"'>" +
685 "<a href='#_footnoteref_" + n +
"' title='Return to text'>" +
686 n +
"</a>. " + note +
"</div>";
687 var id =spans[i].getAttribute(
"id");
688 if (id != null) refs[
"#"+id] = n;
692 noteholder.parentNode.removeChild(noteholder);
694 // Process footnoterefs.
695 for (i=
0; i
<spans.length; i++) {
696 if (spans[i].className ==
"footnoteref") {
697 var href = spans[i].getElementsByTagName(
"a")[
0].getAttribute(
"href");
698 href = href.match(/#.*/)[
0]; // Because IE return full URL.
701 "[<a href='#_footnote_" + n +
702 "' title='View footnote' class='footnote'>" + n +
"</a>]";
708 install: function(toclevels) {
711 function reinstall() {
712 asciidoc.footnotes();
714 asciidoc.toc(toclevels);
718 function reinstallAndRemoveTimer() {
719 clearInterval(timerId);
723 timerId = setInterval(reinstall,
500);
724 if (document.addEventListener)
725 document.addEventListener(
"DOMContentLoaded", reinstallAndRemoveTimer, false);
727 window.onload = reinstallAndRemoveTimer;
735 <body class=
"article">
737 <h1>Reviewing Patches in the Git Project
</h1>
741 <h2 id=
"_introduction">Introduction
</h2>
742 <div class=
"sectionbody">
743 <div class=
"paragraph"><p>The Git development community is a widely distributed, diverse, ever-changing
744 group of individuals. Asynchronous communication via the Git mailing list poses
745 unique challenges when reviewing or discussing patches. This document contains
746 some guiding principles and helpful tools you can use to make your reviews both
747 more efficient for yourself and more effective for other contributors.
</p></div>
748 <div class=
"paragraph"><p>Note that none of the recommendations here are binding or in any way a
749 requirement of participation in the Git community. They are provided as a
750 resource to supplement your skills as a contributor.
</p></div>
754 <h2 id=
"_principles">Principles
</h2>
755 <div class=
"sectionbody">
757 <h3 id=
"_selecting_patch_es_to_review">Selecting patch(es) to review
</h3>
758 <div class=
"paragraph"><p>If you are looking for a patch series in need of review, start by checking
759 latest
"What’s cooking in git.git" email
760 (
<a href=
"https://lore.kernel.org/git/xmqqilm1yp3m.fsf@gitster.g/">example
</a>). The
"What’s
761 cooking" emails
& replies can be found using the query
<code>s:
"What's cooking"</code> on
762 the
<a href=
"https://lore.kernel.org/git/"><code>lore.kernel.org
</code> mailing list archive
</a>;
763 alternatively, you can find the contents of the
"What’s cooking" email tracked
764 in
<code>whats-cooking.txt
</code> on the
<code>todo
</code> branch of Git. Topics tagged with
"Needs
765 review" and those in the
"[New Topics]" section are typically those that would
766 benefit the most from additional review.
</p></div>
767 <div class=
"paragraph"><p>Patches can also be searched manually in the mailing list archive using a query
768 like
<code>s:
"PATCH" -s:
"Re:"</code>. You can browse these results for topics relevant to
769 your expertise or interest.
</p></div>
770 <div class=
"paragraph"><p>If you
’ve already contributed to Git, you may also be CC
’d in another
771 contributor
’s patch series. These are topics where the author feels that your
772 attention is warranted. This may be because their patch changes something you
773 wrote previously (making you a good judge of whether the new approach does or
774 doesn
’t work), or because you have the expertise to provide an exceptionally
775 helpful review. There is no requirement to review these patches but, in the
776 spirit of open source collaboration, you should strongly consider doing so.
</p></div>
779 <h3 id=
"_reviewing_patches">Reviewing patches
</h3>
780 <div class=
"paragraph"><p>While every contributor takes their own approach to reviewing patches, here are
781 some general pieces of advice to make your reviews as clear and helpful as
782 possible. The advice is broken into two rough categories: high-level reviewing
783 guidance, and concrete tips for interacting with patches on the mailing list.
</p></div>
785 <h4 id=
"_high_level_guidance">High-level guidance
</h4>
786 <div class=
"ulist"><ul>
789 Remember to review the content of commit messages for correctness and clarity,
790 in addition to the code change in the patch
’s diff. The commit message of a
791 patch should accurately and fully explain the code change being made in the
797 Reviewing test coverage is an important - but easy to overlook - component of
798 reviews. A patch
’s changes may be covered by existing tests, or new tests may
799 be introduced to exercise new behavior. Checking out a patch or series locally
800 allows you to manually mutate lines of new
& existing tests to verify expected
801 pass/fail behavior. You can use this information to verify proper coverage or
802 to suggest additional tests the author could add.
807 When providing a recommendation, be as clear as possible about whether you
808 consider it
"blocking" (the code would be broken or otherwise made worse if an
809 issue isn
’t fixed) or
"non-blocking" (the patch could be made better by taking
810 the recommendation, but acceptance of the series does not require it).
811 Non-blocking recommendations can be particularly ambiguous when they are
812 related to - but outside the scope of - a series (
"nice-to-have"s), or when
813 they represent only stylistic differences between the author and reviewer.
818 When commenting on an issue, try to include suggestions for how the author
819 could fix it. This not only helps the author to understand and fix the issue,
820 it also deepens and improves your understanding of the topic.
825 Reviews do not need to exclusively point out problems. Feel free to
"think out
826 loud" in your review: describe how you read
& understood a complex section of
827 a patch, ask a question about something that confused you, point out something
828 you found exceptionally well-written, etc. In particular, uplifting feedback
829 goes a long way towards encouraging contributors to participate more actively
830 in the Git community.
836 <h4 id=
"_performing_your_review">Performing your review
</h4>
837 <div class=
"ulist"><ul>
840 Provide your review comments per-patch in a plaintext
"Reply-All" email to the
841 relevant patch. Comments should be made inline, immediately below the relevant
847 You may find that the limited context provided in the patch diff is sometimes
848 insufficient for a thorough review. In such cases, you can review patches in
849 your local tree by either applying patches with
<a href=
"git-am.html">git-am(
1)
</a> or checking
850 out the associated branch from
<a href=
"https://github.com/gitster/git">https://github.com/gitster/git
</a> once the series
856 Large, complicated patch diffs are sometimes unavoidable, such as when they
857 refactor existing code. If you find such a patch difficult to parse, try
858 reviewing the diff produced with the
<code>--color-moved
</code> and/or
859 <code>--ignore-space-change
</code> options.
864 If a patch is long, you are encouraged to delete parts of it that are
865 unrelated to your review from the email reply. Make sure to leave enough
866 context for readers to understand your comments!
871 If you cannot complete a full review of a series all at once, consider letting
872 the author know (on- or off-list) if/when you plan to review the rest of the
880 <h3 id=
"_completing_a_review">Completing a review
</h3>
881 <div class=
"paragraph"><p>Once each patch of a series is reviewed, the author (and/or other contributors)
882 may discuss the review(s). This may result in no changes being applied, or the
883 author will send a new version of their patch(es).
</p></div>
884 <div class=
"paragraph"><p>After a series is rerolled in response to your or others' review, make sure to
885 re-review the updates. If you are happy with the state of the patch series,
886 explicitly indicate your approval (typically with a reply to the latest
887 version
’s cover letter). Optionally, you can let the author know that they can
888 add a
"Reviewed-by: <you>" trailer if they resubmit the reviewed patch verbatim
889 in a later iteration of the series.
</p></div>
890 <div class=
"paragraph"><p>Finally, subsequent
"What’s cooking" emails may explicitly ask whether a
891 reviewed topic is ready for merging to the
‘next` branch (typically phrased
892 "Will merge to 'next’?"). You can help the maintainer and author by responding
893 with a short description of the state of your (and others', if applicable)
894 review, including the links to the relevant thread(s).
</p></div>
899 <h2 id=
"_terminology">Terminology
</h2>
900 <div class=
"sectionbody">
901 <div class=
"dlist"><dl>
907 Denotes a small issue that should be fixed, such as a typographical error
908 or mis-alignment of conditions in an
<code>if()
</code> statement.
922 Indicates to the reader that the following comment should not block the
923 acceptance of the patch or series. These are typically recommendations
924 related to code organization
& style, or musings about topics related to
925 the patch in question, but beyond its scope.
929 s/
<before
>/
<after
>/
933 Shorthand for
"you wrote <before>, but I think you meant <after>," usually
934 for misspellings or other typographical errors. The syntax is a reference
935 to
"substitute" command commonly found in Unix tools such as
<code>ed
</code>,
<code>sed
</code>,
936 <code>vim
</code>, and
<code>perl
</code>.
944 The
"Patch 0" of a multi-patch series. This email describes the
945 high-level intent and structure of the patch series to readers on the
946 Git mailing list. It is also where the changelog notes and range-diff of
947 subsequent versions are provided by the author.
949 <div class=
"paragraph"><p>On single-patch submissions, cover letter content is typically not sent as a
950 separate email. Instead, it is inserted between the end of the patch
’s commit
951 message (after the
<code>---
</code>) and the beginning of the diff.
</p></div>
958 Used by either an author or a reviewer to describe features or suggested
959 changes that are out-of-scope of a given patch or series, but are relevant
960 to the topic for the sake of discussion.
967 <h2 id=
"_see_also">See Also
</h2>
968 <div class=
"sectionbody">
969 <div class=
"paragraph"><p><a href=
"MyFirstContribution.html">MyFirstContribution
</a></p></div>
973 <div id=
"footnotes"><hr /></div>
975 <div id=
"footer-text">
977 2022-
09-
21 15:
44:
34 PDT