Fix resetting conflicting files on branch switch

The new code from commit 8a66893 inadvertently reset to the index
version instead of to HEAD and thus didn't reset staged changes.

Fix this and add a new test.

Change-Id: Icf6ffe38949cc8fd42cb35196c090a66c5527901
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>

1 files changed, 2 insertions, 1 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CleanupUncomittedChangesDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CleanupUncomittedChangesDialog.java
index 7e63ba1a7a..c9bf409c2b 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CleanupUncomittedChangesDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CleanupUncomittedChangesDialog.java
@@ -25,6 +25,7 @@ import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
@@ -121,7 +122,7 @@ public class CleanupUncomittedChangesDialog extends MessageDialog {
 			break;
 		case IDialogConstants.ABORT_ID:
 			DiscardChangesOperation operation = new DiscardChangesOperation(
-					repository, fileList);
+					repository, fileList, Constants.HEAD);
 			JobUtil.scheduleUserWorkspaceJob(operation,
 					UIText.DiscardChangesAction_discardChanges,
 					JobFamilies.DISCARD_CHANGES);