Menu
I am using gerrit. I used the following command
$ cd .git/hooks
$ scp -P 29418 demo@localhost:hooks/commit-msg .
$ cd ../..
This adds the change-id to my commit message, however if I amend to a commit it creates a NEW change-id. So when I push back to gerrit it's not adding the patch set, it's creating a whole new review entry.
Any suggests please?
Found the answer, but stackoverflow won't let me answer my own question.
So this was a complete error on my part. When I was trying to commit git commit --amend -m "Initial Commit"
I was inlining the commit message and that was wiping away the change-Id, thus giving me a new one.
367
Creating a new commitWhen you exit the editor, git will call the hook, which will automatically generate and insert a unique Change-Id line. You can inspect the modified message after the commit is complete by executing git show .
From the Gerrit Code Review dashboard, select Browse > Repositories. Under Repository Commands, click Create Change. In the Create Change window, enter the following information: Select branch for new change: Specify the destination branch of the change.
A change represents a single commit under review. Each change is identified by a Change-Id. Multiple git commits can share the same Change-Id, allowing you to update a change as you receive feedback through the code review process. In Gerrit, commits that share the same Change-Id are referred to as patch sets.
To squash the commits, use git rebase -i to do an interactive rebase. For the example above where the last two commits have the same Change-Id, this means an interactive rebase for the last two commits should be done. For further details about the git rebase command please check the Git documentation for rebase.
commit-msg hook work that way:
If you type git commit --amend and edit commit message, you still have old change-id (it is good).
But if you type git commit --amend -m "...." you have removed change-id, so gerrit generates new one.
Rule of a thumb:
Don't use --amend -m with gerrit.
54
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
