motiejus
/
jgit
1
Fork 0
Code Releases Activity

pgm: Handle GitAPIException in Reset command 

This avoids we show a stacktrace on the console by default when this
type of exception is thrown during the run method is executed.

Change-Id: I70dce366081cd1fc4539cf195d6310fef1080eb3
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2019-01-21 23:23:36 +01:00
parent c03700dcb0
commit 5c05b9f38c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Reset.java
View File

@ -49,6 +49,7 @@
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.ResetCommand;
import org.eclipse.jgit.api.ResetCommand.ResetType;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.Option;
import org.kohsuke.args4j.spi.RestOfArgumentsHandler;
@ -74,7 +75,7 @@ class Reset extends TextBuiltin {
/** {@inheritDoc} */
@Override
protected void run() throws Exception {
protected void run() {
try (Git git = new Git(db)) {
ResetCommand command = git.reset();
command.setRef(commit);
@ -94,6 +95,8 @@ protected void run() throws Exception {
command.setMode(mode);
}
command.call();
} catch (GitAPIException e) {
throw die(e.getMessage(), e);
}
}