motiejus
/
jgit
1
Fork 0
Code Releases Activity

pgm: Handle exceptions in Commit 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: Idf5325bcc235fbcf4418239a1d49572409576a7d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2019-01-20 01:27:57 +01:00
parent 5482980e4f
commit 3b059f6ff6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java
View File

@ -37,15 +37,14 @@
*/
package org.eclipse.jgit.pgm;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jgit.api.CommitCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.jgit.api.errors.NoHeadException;
import org.eclipse.jgit.api.errors.NoMessageException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.pgm.internal.CLIText;
@ -87,8 +86,7 @@ class Commit extends TextBuiltin {
/** {@inheritDoc} */
@Override
protected void run() throws NoHeadException, NoMessageException,
ConcurrentRefUpdateException, JGitInternalException, Exception {
protected void run() {
try (Git git = new Git(db)) {
CommitCommand commitCmd = git.commit();
if (author != null)
@ -119,7 +117,7 @@ protected void run() throws NoHeadException, NoMessageException,
RevCommit commit;
try {
commit = commitCmd.call();
} catch (JGitInternalException e) {
} catch (JGitInternalException | GitAPIException e) {
throw die(e.getMessage(), e);
}
@ -133,6 +131,8 @@ protected void run() throws NoHeadException, NoMessageException,
}
outw.println("[" + branchName + " " + commit.name() + "] " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ commit.getShortMessage());
} catch (IOException e) {
throw die(e.getMessage(), e);
}
}
}