<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><br><div><div>On 27 Apr 2015, at 14:55, Russell Bryant <<a href="mailto:russell@russellbryant.net">russell@russellbryant.net</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Mon, Apr 27, 2015 at 8:20 AM, Olle E. Johansson <span dir="ltr"><<a href="mailto:oej@edvina.net" target="_blank">oej@edvina.net</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div style="word-wrap:break-word"><div><div class="h5"><br><div><div>On 24 Apr 2015, at 15:42, Russell Bryant <<a href="mailto:russell@russellbryant.net" target="_blank">russell@russellbryant.net</a>> wrote:</div><br><blockquote type="cite"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Fri, Apr 24, 2015 at 8:31 AM, Joshua Colp <span dir="ltr"><<a href="mailto:jcolp@digium.com" target="_blank">jcolp@digium.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><span>Olle E. Johansson wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
Playing around following Matt's wiki page on gerrit usage, I created<br>
a team branch and did two commits. When pushing it with "git review<br>
{branch}" only the last commit shows up.<br>
<br>
Is that the way it's supposed to be? I thought the whole branch was<br>
the review subject, not just a single commit.<br>
</blockquote>
<br></span>
Gerrit works on a single commit (what it refers to as a patch set) that you want included into a specific branch. As a result you need to squash all commits into a single one, and if review feedback warrants further changes they also need to be squashed back into a single commit with the original changes. The single commit you post for review is what is reviewed and merged into the branch.<br></blockquote><div><br></div><div>Gerrit can also work on a patch series, and tracks dependencies between those patches.</div></div></div></div></blockquote><br></div></div></div><div>Define "patch series" - how do you commit a series of patches for review?</div></div></blockquote><div><br></div><div>In some cases, it makes sense for a feature or fix to be proposed as multiple changes in a series. I feel that it makes things easier to review and understand.</div><div><br></div><div>As a completely realistic example, let's assume we want to add support for toaster control to chan_pjsip. That could be submitted as a series of 3 commits:</div><div><br></div><div>1 - ast_toaster: Add core modular API for toaster control.</div><div>2 - toastip - Add ast_toaster backend for the toastip protocol.</div><div>3 - pjsip_toast - Add chan_pjsip integration with the ast_toaster API. </div><div><br></div><div>Those *could* all be one commit, but it's really the development of a feature in 3 logical chunks, so breaking it up like this is an alternative.</div><div><br></div><div>When it comes to what that actually looks like it git.</div><div><br></div><div>Create a local branch for a feature:</div><div><br></div><div> $ cd asterisk-git</div><div> $ git checkout -b example-patch-series origin/master</div><div><br></div><div>Commit 1:</div><div><br></div><div> $ echo "some text" > foo</div><div> $ git add foo</div><div> $ git commit -m "Add foo"</div><div><br></div><div>Commit 2:</div><div><br></div><div> $ echo "some more text" >> foo</div><div> $ git commit -a -m "Add more text to foo"</div><div><br></div><div>We now have 2 commits on top of the master branch:</div><div><br></div><div><div> $ git log --oneline origin/master..HEAD</div><div> 5a53b4f Add more text to foo.</div><div> 4bf86fa Add foo.</div></div><div><br></div><div>Post series of 2 commits for review:</div><div><br></div><div><div> $ git review</div><div> You are about to submit multiple commits. This is expected if you are</div><div> submitting a commit that is dependent on one or more in-review</div><div> commits. Otherwise you should consider squashing your changes into one</div><div> commit before submitting.</div><div><br></div><div> The outstanding commits are:</div><div><br></div><div> 5a53b4f (HEAD, example-patch-series) Add more text to foo.</div><div> 4bf86fa Add foo.</div><div><br></div><div> Do you really want to submit the above commits?</div><div> Type 'yes' to confirm, other to cancel: </div></div><div><br></div><div>(You would type 'yes' here because you're submitting 2 changes for review intentionally.)</div><div><br></div><div>Here's a wiki page that I think does a nice job laying out some reasoning behind best practices for breaking up changes into a series of commits if anyone is interested:</div><div><br></div><div> <a href="https://wiki.openstack.org/wiki/GitCommitMessages">https://wiki.openstack.org/wiki/GitCommitMessages</a></div><div><br></div></div></div></div></blockquote>THat makes sense.</div><div><br></div><div>/O</div><br></body></html>