CherryPickCommand: fix unclosed resource warning
Change-Id: I2dc76efd16d887048a5cb4af2b2d8e6faa4f22cd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
parent
560ef875e3
commit
7ae3507998
|
@ -142,12 +142,14 @@ public CherryPickResult call() throws GitAPIException, NoMessageException,
|
|||
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 {
|
||||
|
|
Loading…
Reference in New Issue