Bug 582380 - Resolving conflicts during revert does not update commit message in StagingView
Summary: Resolving conflicts during revert does not update commit message in StagingView
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 6.7   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: 6.8   Edit
Assignee: Thomas Wolf CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-09-07 04:08 EDT by Tikhon Tikhonin CLA
Modified: 2023-09-23 10:15 EDT (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Tikhon Tikhonin CLA 2023-09-07 04:08:39 EDT 
When conflicts during revert get resolved, StagingView doesnot update message commit. This "happens" in org.eclipse.egit.ui.internal.staging.StagingView.updateCommitMessageComponent(boolean, boolean) when running this line CommitHelper helper = new CommitHelper(currentRepository);

When CommitHelper.calculateCommitInfo() gets called, cherry-pick and merge conflicts are handled, but there is no handling when  repo is in RepositoryState.REVERT_RESOLVED state.