motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "RepoCommand: Do not wrap GitApiExceptions in GitApiExceptions"

This commit is contained in:
Ivan Frade 2021-11-23 18:05:37 -05:00 committed by Gerrit Code Review @ Eclipse.org
parent 5154585439 cde3ed9ecf
commit 32b1a1b3a3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java
View File

@ -578,10 +578,10 @@ public RevCommit call() throws GitAPIException {
DirCache index = DirCache.newInCore();
ObjectInserter inserter = repo.newObjectInserter();
try (RevWalk rw = new RevWalk(repo)) {
prepareIndex(renamedProjects, index, inserter);
ObjectId treeId = index.writeTree(inserter);
long prevDelay = 0;
for (int i = 0; i < LOCK_FAILURE_MAX_RETRIES - 1; i++) {
try {
@ -597,7 +597,7 @@ public RevCommit call() throws GitAPIException {
}
// In the last try, just propagate the exceptions
return commitTreeOnCurrentTip(inserter, rw, treeId);
} catch (GitAPIException | IOException | InterruptedException e) {
} catch (IOException | InterruptedException e) {
throw new ManifestErrorException(e);
}
}
@ -609,12 +609,11 @@ public RevCommit call() throws GitAPIException {
}
return git.commit().setMessage(RepoText.get().repoCommitMessage)
.call();
} catch (GitAPIException | IOException e) {
} catch (IOException e) {
throw new ManifestErrorException(e);
}
}
private void prepareIndex(List<RepoProject> projects, DirCache index,
ObjectInserter inserter) throws IOException, GitAPIException {
Config cfg = new Config();