motiejus
/
jgit
1
Fork 0
Code Releases Activity

CherryPickCommand: fix unclosed resource warning 

Change-Id: I2dc76efd16d887048a5cb4af2b2d8e6faa4f22cd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2020-04-27 15:14:52 +02:00
parent 560ef875e3
commit 7ae3507998
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java
View File

@ -142,12 +142,14 @@ public CherryPickResult call() throws GitAPIException, NoMessageException,
dco.setProgressMonitor(monitor); dco.setProgressMonitor(monitor);
dco.checkout(); dco.checkout();
if (!noCommit) { if (!noCommit) {
newHead = new Git(getRepository()).commit() try (Git git = new Git(getRepository())) {
.setMessage(srcCommit.getFullMessage()) newHead = git.commit()
.setReflogComment(reflogPrefix + " " //$NON-NLS-1$ .setMessage(srcCommit.getFullMessage())
+ srcCommit.getShortMessage()) .setReflogComment(reflogPrefix + " " //$NON-NLS-1$
.setAuthor(srcCommit.getAuthorIdent()) + srcCommit.getShortMessage())
.setNoVerify(true).call(); .setAuthor(srcCommit.getAuthorIdent())
.setNoVerify(true).call();
}
} }
cherryPickedRefs.add(src); cherryPickedRefs.add(src);
} else { } else {