From: http://people.csail.mit.edu/wollman/ Date: Sun, 10 Jul 2011 17:27:10 +0000 (-0700) Subject: current version of gerrit can match patchsets using the Change-Id line so there's... X-Git-Url: http://git.openafs.org/?p=openafs-wiki.git;a=commitdiff_plain;h=073e3d2094708af479a143218c72114003c9de16 current version of gerrit can match patchsets using the Change-Id line so there's no need to push to an explicit change number any more --- diff --git a/AFSLore/GitDevelopers.mdwn b/AFSLore/GitDevelopers.mdwn index 6aacf18..a251efa 100644 --- a/AFSLore/GitDevelopers.mdwn +++ b/AFSLore/GitDevelopers.mdwn @@ -139,7 +139,7 @@ will discard all of the changes you have made since the last commit, or will restore <file> to the state it was in at the last commit. -## Keeping up with the Jones' +## Keeping up with the Joneses If you're working on a long running development project, you will find that the point your created your topic branch rapidly recedes into history. At some point (and at least before you share your code with us), you'll probably want to update your tree. There are a number of ways of doing this. @@ -234,13 +234,9 @@ Assuming all has gone well, this will have added the entry to the code review qu It's possible that your modifications won't be accepted first time. In this case, you need to revise your changes, and resubmit them to gerrit. Please note that this should always be done by modifying your original changeset, _not_ by submitting a new change that makes the required fixes. Either git commit --amend, or git rebase should be used to combine your changes with the original changeset, and then you should push this to gerrit with - git push ssh://gerrit.openafs.org/openafs.git :refs/changes/ + git push ssh://gerrit.openafs.org/openafs.git :refs/for/ -(where <hash> is the sha1 hash of the revised change that follows the word commit in the log message, and <number> is the change number you received when you originally submitted the patch) - -You can obtain the sha1 hash of a commit by using 'git show' (if it is on the tip of your current branch), or 'git log' (if it is in your history) - -Other mechanisms of listing the change to push are available - see for full details. +where <revision> is the SHA-1 hash of the revised change that follows the word commit in the log message, or simply HEAD if the revised change is the most recent change on your topic branch. You can obtain the SHA-1 hash of a commit by using 'git log'. Note that pushing to refs/for/... _requires_ a change-id in your commit message, so that Gerrit can match to the new change with the one you submitted previously. See for full details. ## Updating your change