Gerrit recreating change-ids

Question

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.

Are you sure that the ChangeId is in the last paragraph of the commit message? Have a look at: [ChangeId](http://gerrit.chromium.org/gerrit/Documentation/user-changeid.html) — Vicente Quintans, Oct 26 '11 at 14:08
Mmmm, I have just finished reading your question :-) and yes, the -m is a typical error. — Vicente Quintans, Oct 26 '11 at 14:10

Tomasz Wysocki · Accepted Answer · 2011-12-28T17:15:23.967

34

commit-msg hook work that way:

Check if you have change-id in your commit message.
If not, generates one.

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.

edited Dec 28 '11 at 17:15

answered Dec 05 '11 at 22:02

Tomasz Wysocki

11,170
6
47
62

If you really wanted to, one could write a prepare-commit-msg hook that would squirrel away the changeid and then put it back on. – forivall Dec 05 '12 at 01:10
2

Yikes! found this too late :) – mlvljr Jan 24 '14 at 08:47
--ammend and -m do work ... you just have to remember to to a `git rebase --interactive` before pushing - to cleanup things. And of course, you have to make sure to not change the change id when doing so ;-) – GhostCat Jan 25 '18 at 16:45

score 6 · Answer 2 · answered May 15 '19 at 12:55

6

git commit --amend
Manually delete the Change-Id line, save and close
git commit --amend --no-edit

And the hook will create a new Change-Id hash, in the absence of one.

answered May 15 '19 at 12:55

drgnfr

91
1
4

2

That is in fact the easiest way to re-generate change-id, and shall be accepted as a correct way – Hubert Liberacki Jun 18 '20 at 12:56

score 1 · Answer 3 · edited May 23 '17 at 12:25

If git commit --amend or git commit --amend -m "...." doesn't help and gerrit still complains about the missing change-Id. (This happens due to network issues mostly)

This is how I got it resolved (Made sure I had the commit-msg hook applied, on parent directory of the checked-out directory reference):

Stash the Changes using git stash.
Used gitk & to hard rebase the change to just previous commit.
Then pull and rebase from Repo git pull --rebase.
Then apply the stashed changes using git stash apply, reference. Resolve Merger Conflicts if any using git mergetool.
Recommitted in the change again using git commit or git commit --amend, this generated a new change-Id
Push the changes to branch on repository using git push ... command.

There is similar question around as well for reference

Gerrit recreating change-ids

3 Answers3