[gmx-developers] git merge blues

David van der Spoel spoel at xray.bmc.uu.se
Tue Oct 1 12:06:33 CEST 2013


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: Change-Id: Ie4097d8954938e13d6a6f74998e665c76a78c1ab
remote: Hint: To automatically insert Change-Id, install the hook:
remote:   scp -p -P 22 dspoel at gerrit.gromacs.org:hooks/commit-msg 

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?

David van der Spoel, Ph.D., Professor of Biology
Dept. of Cell & Molec. Biol., Uppsala University.
Box 596, 75124 Uppsala, Sweden. Phone:	+46184714205.
spoel at xray.bmc.uu.se    http://folding.bmc.uu.se

More information about the gromacs.org_gmx-developers mailing list