[gmx-developers] git merge blues

[Mark Abraham]

That sounds likely.

Mark


On Fri, Oct 4, 2013 at 5:41 PM, David van der Spoel <spoel at xray.bmc.uu.se>wrote:

> On 2013-10-04 12:01, Mark Abraham wrote:
>
>> Not sure on the available information. Any luck yet?
>>
>>  git merge --squash
>
> Good enough for a first commit.
>
> I think the culprit was that 50+ old commits did not have a change id
> since they were one in a separate branch.
>
>  Mark
>>
>> On Oct 1, 2013 12:06 PM, "David van der Spoel" <spoel at xray.bmc.uu.se
>> <mailto:spoel at xray.bmc.uu.se>> 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: Ie4097d8954938e13d6a6f74998e66**__5c76a78c1ab
>>
>>     remote:
>>     remote: Hint: To automatically insert Change-Id, install the hook:
>>     remote:   scp -p -P 22 dspoel at gerrit.gromacs.org:hook**__s/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?
>>
>>     --
>>     David van der Spoel, Ph.D., Professor of Biology
>>     Dept. of Cell & Molec. Biol., Uppsala University.
>>     Box 596, 75124 Uppsala, Sweden. Phone: +46184714205
>>     <tel:%2B46184714205>.
>>     spoel at xray.bmc.uu.se <mailto:spoel at xray.bmc.uu.se>
>>
>>     http://folding.bmc.uu.se
>>     --
>>     gmx-developers mailing list
>>     gmx-developers at gromacs.org <mailto:gmx-developers@**gromacs.org<gmx-developers at gromacs.org>
>> >
>>     http://lists.gromacs.org/__**mailman/listinfo/gmx-__**developers<http://lists.gromacs.org/__mailman/listinfo/gmx-__developers>
>>
>>     <http://lists.gromacs.org/**mailman/listinfo/gmx-**developers<http://lists.gromacs.org/mailman/listinfo/gmx-developers>
>> >
>>     Please don't post (un)subscribe requests to the list. Use the www
>>     interface or send it to gmx-developers-request at __groma**cs.org<http://gromacs.org>
>>     <mailto:gmx-developers-**request at gromacs.org<gmx-developers-request at gromacs.org>
>> >.
>>
>>
>>
>>
>
> --
> 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
> --
> gmx-developers mailing list
> gmx-developers at gromacs.org
> http://lists.gromacs.org/**mailman/listinfo/gmx-**developers<http://lists.gromacs.org/mailman/listinfo/gmx-developers>
> Please don't post (un)subscribe requests to the list. Use the www
> interface or send it to gmx-developers-request@**gromacs.org<gmx-developers-request at gromacs.org>
> .
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://maillist.sys.kth.se/pipermail/gromacs.org_gmx-developers/attachments/20131004/9d89d15c/attachment.html>