Community
Participate
Working Groups
Steps to reproduce: 1. have two branches with conflicting changes 2. merge the branches -> this results in a conflict 3. resolve the conflicts and do git add for the conflict resolution 4. open the commit dialog and check the 'Compute Change-Id for Gerrit Code Review' checkbox -> the Change-ID placeholder 'Change-Id: I0000000000000000000000000000000000000000' is inserted into the commit message 5. commit 6. look at the new commit in the history and see that the commit message still contains the Change-ID placeholder 'Change-Id: I0000000000000000000000000000000000000000' What was expected: It was expected that on commit a new Change-ID would be computed and inserted into the commit message at the place of the Change-ID placeholder. Workaround: Open the commit dialog once again and amend the commit with having the 'Compute Change-Id for Gerrit Code Review' checkbox checked again.
EGit uses JGit Commit command for committing merge commits ("normal" commit are currently done using deprecated GitIndex). JGit commit command needs to provide a mechanism for replacing the initial change ids.
(In reply to comment #1) > EGit uses JGit Commit command for committing merge commits ("normal" commit are > currently done using deprecated GitIndex). > JGit commit command needs to provide a mechanism for replacing the initial > change ids. Is this fixed then with the new CommitOperation?
Fix proposed: http://egit.eclipse.org/r/2883
This works now with 8a0901053fc43abfef366b0a9399cdbb797a8b7b
