Bug 562073 - IOException: Cannot resolve ORIG_HEAD
Summary: IOException: Cannot resolve ORIG_HEAD
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows 10
: P3 normal (vote)
Target Milestone: 5.8   Edit
Assignee: Thomas Wolf CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-04-13 12:48 EDT by Michael Keppler CLA
Modified: 2020-04-14 13:33 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 Michael Keppler CLA 2020-04-13 12:48:26 EDT 
I've just cloned the epp.packages repository, and tried to revert commit fac086f5cec00c946cb8b9baacd3b0c2c542aed2 from history. That failed with a conflict. Double clicking the conflicting file in the staging view lead to an exception in the compare editor initialization.

java.io.IOException: Cannot resolve ORIG_HEAD
	at org.eclipse.egit.ui.internal.merge.GitMergeEditorInput.prepareInput(GitMergeEditorInput.java:182)
	at org.eclipse.compare.CompareEditorInput.run(CompareEditorInput.java:475)
	at org.eclipse.compare.internal.CompareUIPlugin.prepareInput(CompareUIPlugin.java:594)
	at org.eclipse.compare.internal.CompareEditor$1.run(CompareEditor.java:338)
	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:63)
Comment 1 Thomas Wolf CLA 2020-04-14 08:41:54 EDT 
At that point there is no ORIG_HEAD, but there is a REVERT_HEAD pointing to fac086f5.
Comment 2 Eclipse Genie CLA 2020-04-14 09:58:40 EDT 
New Gerrit change created: https://git.eclipse.org/r/160906
Comment 3 Eclipse Genie CLA 2020-04-14 13:32:57 EDT 
Gerrit change https://git.eclipse.org/r/160906 was merged to [master].
Commit: http://git.eclipse.org/c/egit/egit.git/commit/?id=dd63d8e3ada5c2ab599943e7f4e3de54cdf90169