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

Bug 358206

Summary:	Respect gerrit.createchangeid when creating merge commits
Product:	[Technology] EGit	Reporter:	Matthias Sohn <matthias.sohn>
Component:	UI	Assignee:	Project Inbox <egit.ui-inbox>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	eclipse.org, michael.keppler
Version:	1.1
Target Milestone:	5.0
Hardware:	All
OS:	All
See Also:	https://git.eclipse.org/r/120871 https://git.eclipse.org/r/120872 https://git.eclipse.org/c/jgit/jgit.git/commit/?id=42e69409d796421bb1353279cfae463b19a43fe9 https://git.eclipse.org/c/egit/egit.git/commit/?id=928d731a204171bbcad89516efd39b6373b77b72
Whiteboard:

Description Matthias Sohn

2011-09-20 05:21:41 EDT

The EGit plugin's merge command, when doing a real conflict-free merge, is creating a commit w/o a Change-Id, although gerrit.createchangeid  is true. As a consequence, gerrit refuses to accept my push command later on if the project was configured to require Change-Id.

Comment 1 François Rey

2012-11-25 16:10:00 EST

See also bug #367416

Comment 2 Michael Keppler

2015-02-09 06:28:38 EST

Any chance for fixing this? Our team is using feature branches a lot by now, to have some more isolation in implementing different features in parallel, and people almost always forget to manually amend the merge commit, when either finally merging the feature branch into master, or when updating the feature branch by merging current master.

Comment 3 Eclipse Genie

2018-04-06 18:15:10 EDT

New Gerrit change created: https://git.eclipse.org/r/120871

Comment 4 Eclipse Genie

2018-04-06 18:19:24 EDT

New Gerrit change created: https://git.eclipse.org/r/120872

Comment 5 Eclipse Genie

2018-04-19 13:44:02 EDT

Gerrit change https://git.eclipse.org/r/120871 was merged to [master].
Commit: http://git.eclipse.org/c/jgit/jgit.git/commit/?id=42e69409d796421bb1353279cfae463b19a43fe9

Comment 6 Eclipse Genie

2018-04-19 18:38:25 EDT

Gerrit change https://git.eclipse.org/r/120872 was merged to [master].
Commit: http://git.eclipse.org/c/egit/egit.git/commit/?id=928d731a204171bbcad89516efd39b6373b77b72