My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 3150: commit-msg hook should move Change-Id line after "conflicts" lines
1 person starred this issue and may be notified of changes. Back to list
Status:  WontFix
Owner:  ----
Closed:  Feb 2015


Sign in to add a comment
 
Project Member Reported by david.pu...@sonymobile.com, Jan 29, 2015
When a merge conflict is resolved, the commit message can end up with a "conflicts" section added after the existing Change-Id line.

The commit-msg hook should detect this and move the Change-Id line to after the conflicts section.

Jan 29, 2015
Project Member #1 bklarson@gmail.com
FWIW, I'm not sure this is really an issue with the commit-msg hook.  It feels like more of an issue in git?

That section is always added after the name-value commit footer.  So if I have other values in there (which is common in our workflow at $DAYJOB), the "conflicts" section is below all of them.

If we change the hook to move Change-Id, I assume it will still leave all those other name-value pairs.  Which is overall a worse solution really.

I'm not sure why git puts that "conflicts" section after the commit footer.  I've always wondered if that was a bug or intentional... it has never been clear to me if that section is intended to stay in the commit message or be removed.
Feb 5, 2015
Project Member #2 david.pu...@sonymobile.com
I see in the latest version of git [1] the conflicts section is commented out.


[1] http://git-blame.blogspot.jp/2015/02/git-23.html

Feb 8, 2015
Project Member #3 david.pu...@sonymobile.com
Recommend updating git client instead.

Status: WontFix
Sign in to add a comment

Powered by Google Project Hosting