Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 367416

Summary:	Gerrit Change-ID quirks after merge/cherry-pick
Product:	[Technology] JGit	Reporter:	Markus Duft <markus.duft>
Component:	JGit	Assignee:	Project Inbox <jgit.core-inbox>
Status:	RESOLVED FIXED	QA Contact:
Severity:	major
Priority:	P3	CC:	beyhan.veliev, eclipse.org, matthias.schmalz, matthias.sohn, robin.rosenberg
Version:	2.3
Target Milestone:	2.3
Hardware:	PC
OS:	Linux
Whiteboard:

Description Markus Duft

2011-12-22 07:42:31 EST

Build Identifier: 20110916-0149

When i have a conflict during merge or cherry-pick, i resolve the conflict and then press commit. Two problems are here now:

 1) the existing gerrit change-id of the original commit i'm cherry-picking is reset to all zeroes
 2) the gerrit change-id is in the wrong place. gerrit expects it to be the last thing in the message, but it isn't, because the "Conflicts: <files...>" paragraph follows it.

Reproducible: Always

Steps to Reproduce:
1. create two branches from master.
2. commit a little on both, producing a conflict (gerrit change id enabled for each commit)
3. cherry-pick one conflicting commit to the other branch
4. press commit

Comment 1 François Rey

2012-11-25 16:13:11 EST

See also bug #358206

Comment 2 Stefan Lay

2013-01-08 11:03:20 EST

Fix proposed for reseting to zeros: https://git.eclipse.org/r/#/c/9529/
Fix proposed for inserting before the footer paragraph: https://git.eclipse.org/r/#/c/9530/

Comment 3 Robin Rosenberg

2013-01-19 11:55:48 EST

Merged 215a74ecebedba54c326f4dc51edb3795e807869

Comment 4 Matthias Sohn

2013-02-02 19:57:38 EST

(In reply to comment #2)
> Fix proposed for reseting to zeros: https://git.eclipse.org/r/#/c/9529/

merged as 9cc852592571d04a20e4f591f9985bfe11dd1405