On Sun, Feb 5, 2012 at 3:32 AM, James Robinson <[email protected]> wrote: > Hello again, > I followed the Hacking documentation and created my account etc...... > When I did the "git push review" I am getting the following error. > > To ssh://[email protected]:29418/openocd.git > ! [remote rejected] HEAD -> refs/for/master (missing Change-Id in > commit message) > error: failed to push some refs to > 'ssh://[email protected]:29418/openocd.git' > > I am REALLY green when it come to using git. What did I do wrong? Is > there a step I forgot? > Thanks again and sorry for noob questions... > James >
Hi! Gerrit needs a Change-Id line in the commit message to identify the change so if you push an updated version of the same patch, it will not be viewed as a new patch. The commit-msg hook you installed as part of the HACKING steps will automatically add the necessary line to the commit message for new commits. However, commits you have made prior to adding the hook will lack the Change-Id, so it needs to be added. If your patchset is only one commit, you can re-commit it using git commit --amend --reuse-message=HEAD If you have made several commits since origin/master, you can force the commit-msg hook to run on them by doing an interactive rebase: git rebase -i origin/master -> Change the word "pick" at the start of all lines to "r" (reword), save and exit. -> You will be given the chance to change the commit message for each commit in order. Simply keep the message and exit the editor. Check with git log that the commits contain a Change-Id line. /Andreas ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
