[gmx-developers] git merge blues

[Berk Hess]

Hi,

I don't know what could have gone wrong.
But now doing git commit --amend (without then changing the commit 
message manually) will add a new change-id.

Cheers,

Berk

On 10/01/2013 12:06 PM, David van der Spoel wrote:
> Hi,
>
> I'm trying to merge in a local branch that I worked on into master.
>
> git merge branch
> works fine.
>
> But the then git push git push origin HEAD:refs/for/master gives me
>
> Counting objects: 942, done.
> Delta compression using up to 4 threads.
> Compressing objects: 100% (365/365), done.
> Writing objects: 100% (766/766), 210.29 KiB, done.
> Total 766 (delta 674), reused 458 (delta 401)
> remote: Resolving deltas: 100% (674/674)
> remote: Processing changes: refs: 1, done
> remote: ERROR: missing Change-Id in commit message footer
> remote: Suggestion for commit message:
> remote: New files
> remote:
> remote: Change-Id: Ie4097d8954938e13d6a6f74998e665c76a78c1ab
> remote:
> remote: Hint: To automatically insert Change-Id, install the hook:
> remote:   scp -p -P 22 dspoel at gerrit.gromacs.org:hooks/commit-msg 
> .git/hooks/
> remote:
>
>
> However I have the hook installed and there is a change id.
>
> Any clue?
> Could this in fact apply to earlier commits in the branch I merged?
>