From 7ae35079981dbacecb033fc1980d7d4e16b59fdc Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 27 Apr 2020 15:14:52 +0200 Subject: [PATCH] CherryPickCommand: fix unclosed resource warning Change-Id: I2dc76efd16d887048a5cb4af2b2d8e6faa4f22cd Signed-off-by: Matthias Sohn --- .../org/eclipse/jgit/api/CherryPickCommand.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java index c5bc8587e..5d0154c6d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java @@ -142,12 +142,14 @@ public class CherryPickCommand extends GitCommand { dco.setProgressMonitor(monitor); dco.checkout(); if (!noCommit) { - newHead = new Git(getRepository()).commit() - .setMessage(srcCommit.getFullMessage()) - .setReflogComment(reflogPrefix + " " //$NON-NLS-1$ - + srcCommit.getShortMessage()) - .setAuthor(srcCommit.getAuthorIdent()) - .setNoVerify(true).call(); + try (Git git = new Git(getRepository())) { + newHead = git.commit() + .setMessage(srcCommit.getFullMessage()) + .setReflogComment(reflogPrefix + " " //$NON-NLS-1$ + + srcCommit.getShortMessage()) + .setAuthor(srcCommit.getAuthorIdent()) + .setNoVerify(true).call(); + } } cherryPickedRefs.add(src); } else {