diff options
| author | Jens Baumgart <jens.baumgart@sap.com> | 2010-09-02 18:01:47 +0200 |
|---|---|---|
| committer | Jens Baumgart <jens.baumgart@sap.com> | 2010-09-02 18:01:47 +0200 |
| commit | f714988c61bc188fd5e9ce6a848e4f19690f48a5 (patch) | |
| tree | ea76064f41caea8ffc14d9f4024234b13536cff9 | |
| parent | 7a504b8d7cf7a329774993ea94776a76886e4017 (diff) | |
| download | jgit-f714988c61bc188fd5e9ce6a848e4f19690f48a5.tar.gz jgit-f714988c61bc188fd5e9ce6a848e4f19690f48a5.zip | |
Fix RepositoryState.MERGING
canResetHead now returns true.
Resetting mixed / hard works in EGit in merging state.
Change-Id: I1512145bbd831bb9734528ce8b71b1701e3e6aa9
Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java index 0a59906e94..e0b5389ac0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java @@ -73,11 +73,11 @@ public enum RepositoryState { public String getDescription() { return JGitText.get().repositoryState_normal; } }, - /** An unfinished merge. Must resole or reset before continuing normally + /** An unfinished merge. Must resolve or reset before continuing normally */ MERGING { public boolean canCheckout() { return false; } - public boolean canResetHead() { return false; } + public boolean canResetHead() { return true; } public boolean canCommit() { return false; } public String getDescription() { return JGitText.get().repositoryState_conflicts; } }, |