problem with Change-Id in (gwt-site) git push origin HEAD:refs/for/master

33 views
Skip to first unread message

Scott Morgan

unread,
Oct 17, 2014, 5:57:30 PM10/17/14
to google-web-tool...@googlegroups.com
Hi,

    I am having issues pushing my gwt-site change up;
To https://gwt.googlesource.com/gwt-site
 ! [remote rejected] HEAD -> refs/for/master (missing Change-Id in commit message footer)
error: failed to push some refs to 'https://gwt.googlesource.com/gwt-site'

[gwt@localhost gwt-site]$ ls -Al .git/hooks
total 48
-rwxrwxr-x. 1 gwt gwt  452 Oct 17 14:29 applypatch-msg.sample
-rwxrwxr-x. 1 gwt gwt 4377 Oct 17 14:42 commit-msg
-rwxrwxr-x. 1 gwt gwt  896 Oct 17 14:29 commit-msg.sample
-rwxrwxr-x. 1 gwt gwt  189 Oct 17 14:29 post-update.sample
-rwxrwxr-x. 1 gwt gwt  398 Oct 17 14:29 pre-applypatch.sample
-rwxrwxr-x. 1 gwt gwt 1704 Oct 17 14:29 pre-commit.sample
-rwxrwxr-x. 1 gwt gwt 1239 Oct 17 14:29 prepare-commit-msg.sample
-rw-rw-r--. 1 gwt gwt 1348 Oct 17 14:29 pre-push.sample
-rwxrwxr-x. 1 gwt gwt 4951 Oct 17 14:29 pre-rebase.sample
-rwxrwxr-x. 1 gwt gwt 3611 Oct 17 14:29 update.sample

   Is there some different way to push changes to 'gwt-site' than gwt 'trunk'?
I tried;
git push origin HEAD:refs/for/master

Anyway it is a simple change to RefJreEmulation.md, and I have attached it.

Cheers,
Scott
RefJreEmulation.md

Thomas Broyer

unread,
Oct 17, 2014, 6:12:27 PM10/17/14
to google-web-tool...@googlegroups.com


On Friday, October 17, 2014 11:57:30 PM UTC+2, Scott Morgan wrote:
Hi,

    I am having issues pushing my gwt-site change up;
To https://gwt.googlesource.com/gwt-site
 ! [remote rejected] HEAD -> refs/for/master (missing Change-Id in commit message footer)
error: failed to push some refs to 'https://gwt.googlesource.com/gwt-site'

[gwt@localhost gwt-site]$ ls -Al .git/hooks
total 48
-rwxrwxr-x. 1 gwt gwt  452 Oct 17 14:29 applypatch-msg.sample
-rwxrwxr-x. 1 gwt gwt 4377 Oct 17 14:42 commit-msg
-rwxrwxr-x. 1 gwt gwt  896 Oct 17 14:29 commit-msg.sample
-rwxrwxr-x. 1 gwt gwt  189 Oct 17 14:29 post-update.sample
-rwxrwxr-x. 1 gwt gwt  398 Oct 17 14:29 pre-applypatch.sample
-rwxrwxr-x. 1 gwt gwt 1704 Oct 17 14:29 pre-commit.sample
-rwxrwxr-x. 1 gwt gwt 1239 Oct 17 14:29 prepare-commit-msg.sample
-rw-rw-r--. 1 gwt gwt 1348 Oct 17 14:29 pre-push.sample
-rwxrwxr-x. 1 gwt gwt 4951 Oct 17 14:29 pre-rebase.sample
-rwxrwxr-x. 1 gwt gwt 3611 Oct 17 14:29 update.sample

   Is there some different way to push changes to 'gwt-site' than gwt 'trunk'?

Nothing different.
Did you maybe setup the commit-msg hook after you made your commit? If so, amend it to have the hook run against it.
 
I tried;
git push origin HEAD:refs/for/master

Anyway it is a simple change to RefJreEmulation.md, and I have attached it.

RefJreEmultation is (was) meant to be updated from a file generated during the GWT build (see the "emul-ezt" task in doc/build.xml)
I don't think we did it in a while though; something to add to the release process I suppose.
 

Cheers,
Scott

Scott Morgan

unread,
Oct 17, 2014, 6:37:43 PM10/17/14
to google-web-tool...@googlegroups.com
Ok that worked, thanks!
Scott

Jonathan Nieder

unread,
Oct 17, 2014, 6:43:14 PM10/17/14
to google-web-tool...@googlegroups.com
What does 'git log -1' say?

I'm guessing there's a "Conflicts:" section under the Change-Id line. The Change-Id needs to be in the last paragraph, and unfortunately the commit-msg hook isn't smart enough about warning about that today.
--
You received this message because you are subscribed to the Google Groups "GWT Contributors" group.
To unsubscribe from this group and stop receiving emails from it, send an email to google-web-toolkit-co...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/google-web-toolkit-contributors/20af084e-40bd-41d6-b88d-7c6da79555b2%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
Reply all
Reply to author
Forward
0 new messages