aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit
diff options
context:
space:
mode:
authorChristian Halstrick <christian.halstrick@sap.com>2010-11-24 09:43:38 +0100
committerChristian Halstrick <christian.halstrick@sap.com>2010-11-24 15:59:08 +0100
commit7e298c9ed538dd8d5207adce3497b4a1df701dc5 (patch)
tree13c9057dc5b7604f9fcb75a348b566b82d934237 /org.eclipse.jgit/src/org/eclipse/jgit
parentc441380f9cf6a294f6353ff35526a367f950004f (diff)
downloadjgit-7e298c9ed538dd8d5207adce3497b4a1df701dc5.tar.gz
jgit-7e298c9ed538dd8d5207adce3497b4a1df701dc5.zip
Add more tests for rebase and externalized missing Strings
Coverage tests showed that we are missing to test certain areas in the rebase command. Add the missing tests. Change-Id: Ia4a272d26cde7e1861dac30496e4b6799fc8187a Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java1
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java3
2 files changed, 3 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
index c24e5bb65a..c0b77f26a1 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
@@ -69,6 +69,7 @@ public class JGitText extends TranslationBundle {
/***/ public String aNewObjectIdIsRequired;
/***/ public String abbreviationLengthMustBeNonNegative;
/***/ public String abortingRebase;
+ /***/ public String abortingRebaseFailed;
/***/ public String advertisementCameBefore;
/***/ public String advertisementOfCameBefore;
/***/ public String amazonS3ActionFailed;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
index bda7f266ee..0938ec1051 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
@@ -434,7 +434,8 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
case NO_CHANGE:
break;
default:
- throw new IOException("Could not abort rebase");
+ throw new JGitInternalException(
+ JGitText.get().abortingRebaseFailed);
}
}
// cleanup the files