diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2016-02-03 10:30:38 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2016-02-03 10:30:52 +0100 |
| commit | b0facdc1132e940272ef99e13c1100ccc3a70a78 (patch) | |
| tree | a79475ae38a4e1e41c61f055c4ad64b40595198a /org.eclipse.jgit | |
| parent | 27a6a5265465c50ec2ed76c4fcdd84bd1175779f (diff) | |
| parent | 06bf69d8ca36ca81d6f1d86026c72302fdf72189 (diff) | |
| download | jgit-b0facdc1132e940272ef99e13c1100ccc3a70a78.tar.gz jgit-b0facdc1132e940272ef99e13c1100ccc3a70a78.zip | |
Merge branch 'stable-4.2'
* stable-4.2:
DirCacheCheckoutTest: Open Git and TreeWalk in try-with-resource
CommitCommand: Remove declaration of unthrown exception
Branch: Fix variable hiding warning
ApplyCommandTest: Open Git in try-with-resource
PackFileTest: Open ObjectInserter.Formatter in try-with-resource
Change-Id: I8484b10fad5a4c35fcfaedc1cdf8ccf97471618e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java index b5057ad282..0abb8ba4ec 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java @@ -312,7 +312,7 @@ public class CommitCommand extends GitCommand<RevCommit> { } } - private void insertChangeId(ObjectId treeId) throws IOException { + private void insertChangeId(ObjectId treeId) { ObjectId firstParentId = null; if (!parents.isEmpty()) firstParentId = parents.get(0); |