<div dir="ltr">That sounds likely.<div><br></div><div>Mark</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Oct 4, 2013 at 5:41 PM, David van der Spoel <span dir="ltr"><<a href="mailto:spoel@xray.bmc.uu.se" target="_blank">spoel@xray.bmc.uu.se</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">On 2013-10-04 12:01, Mark Abraham wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Not sure on the available information. Any luck yet?<br>
<br>
</blockquote></div>
git merge --squash<br>
<br>
Good enough for a first commit.<br>
<br>
I think the culprit was that 50+ old commits did not have a change id since they were one in a separate branch.<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">
Mark<br>
<br>
On Oct 1, 2013 12:06 PM, "David van der Spoel" <<a href="mailto:spoel@xray.bmc.uu.se" target="_blank">spoel@xray.bmc.uu.se</a><br></div><div class="im">
<mailto:<a href="mailto:spoel@xray.bmc.uu.se" target="_blank">spoel@xray.bmc.uu.se</a>>> wrote:<br>
<br>
Hi,<br>
<br>
I'm trying to merge in a local branch that I worked on into master.<br>
<br>
git merge branch<br>
works fine.<br>
<br>
But the then git push git push origin HEAD:refs/for/master gives me<br>
<br>
Counting objects: 942, done.<br>
Delta compression using up to 4 threads.<br>
Compressing objects: 100% (365/365), done.<br>
Writing objects: 100% (766/766), 210.29 KiB, done.<br>
Total 766 (delta 674), reused 458 (delta 401)<br>
remote: Resolving deltas: 100% (674/674)<br>
remote: Processing changes: refs: 1, done<br>
remote: ERROR: missing Change-Id in commit message footer<br>
remote: Suggestion for commit message:<br>
remote: New files<br>
remote:<br></div>
remote: Change-Id: Ie4097d8954938e13d6a6f74998e66<u></u>__5c76a78c1ab<div class="im"><br>
remote:<br>
remote: Hint: To automatically insert Change-Id, install the hook:<br></div>
remote: scp -p -P 22 dspoel@gerrit.gromacs.org:hook<u></u>__s/commit-msg<div class="im"><br>
.git/hooks/<br>
remote:<br>
<br>
<br>
However I have the hook installed and there is a change id.<br>
<br>
Any clue?<br>
Could this in fact apply to earlier commits in the branch I merged?<br>
<br>
--<br>
David van der Spoel, Ph.D., Professor of Biology<br>
Dept. of Cell & Molec. Biol., Uppsala University.<br>
Box 596, 75124 Uppsala, Sweden. Phone: <a href="tel:%2B46184714205" value="+46184714205" target="_blank">+46184714205</a><br></div>
<tel:%2B46184714205>.<br>
<a href="mailto:spoel@xray.bmc.uu.se" target="_blank">spoel@xray.bmc.uu.se</a> <mailto:<a href="mailto:spoel@xray.bmc.uu.se" target="_blank">spoel@xray.bmc.uu.se</a>><div class="im"><br>
<a href="http://folding.bmc.uu.se" target="_blank">http://folding.bmc.uu.se</a><br>
--<br>
gmx-developers mailing list<br></div>
<a href="mailto:gmx-developers@gromacs.org" target="_blank">gmx-developers@gromacs.org</a> <mailto:<a href="mailto:gmx-developers@gromacs.org" target="_blank">gmx-developers@<u></u>gromacs.org</a>><br>
<a href="http://lists.gromacs.org/__mailman/listinfo/gmx-__developers" target="_blank">http://lists.gromacs.org/__<u></u>mailman/listinfo/gmx-__<u></u>developers</a><div class="im"><br>
<<a href="http://lists.gromacs.org/mailman/listinfo/gmx-developers" target="_blank">http://lists.gromacs.org/<u></u>mailman/listinfo/gmx-<u></u>developers</a>><br>
Please don't post (un)subscribe requests to the list. Use the www<br></div>
interface or send it to gmx-developers-request@__<a href="http://gromacs.org" target="_blank">groma<u></u>cs.org</a><br>
<mailto:<a href="mailto:gmx-developers-request@gromacs.org" target="_blank">gmx-developers-<u></u>request@gromacs.org</a>>.<br>
<br>
<br>
<br>
</blockquote><div class="HOEnZb"><div class="h5">
<br>
<br>
-- <br>
David van der Spoel, Ph.D., Professor of Biology<br>
Dept. of Cell & Molec. Biol., Uppsala University.<br>
Box 596, 75124 Uppsala, Sweden. Phone: <a href="tel:%2B46184714205" value="+46184714205" target="_blank">+46184714205</a>.<br>
<a href="mailto:spoel@xray.bmc.uu.se" target="_blank">spoel@xray.bmc.uu.se</a> <a href="http://folding.bmc.uu.se" target="_blank">http://folding.bmc.uu.se</a><br>
-- <br>
gmx-developers mailing list<br>
<a href="mailto:gmx-developers@gromacs.org" target="_blank">gmx-developers@gromacs.org</a><br>
<a href="http://lists.gromacs.org/mailman/listinfo/gmx-developers" target="_blank">http://lists.gromacs.org/<u></u>mailman/listinfo/gmx-<u></u>developers</a><br>
Please don't post (un)subscribe requests to the list. Use the www interface or send it to <a href="mailto:gmx-developers-request@gromacs.org" target="_blank">gmx-developers-request@<u></u>gromacs.org</a>.<br>
</div></div></blockquote></div><br></div>