浏览代码

CherryPickCommand: fix unclosed resource warning

Change-Id: I2dc76efd16d887048a5cb4af2b2d8e6faa4f22cd
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
tags/v5.8.0.202005061305-m2
Matthias Sohn 4 年前
父节点
当前提交
7ae3507998
共有 1 个文件被更改,包括 8 次插入6 次删除
  1. 8
    6
      org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java

+ 8
- 6
org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java 查看文件

@@ -142,12 +142,14 @@ public class CherryPickCommand extends GitCommand<CherryPickResult> {
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 {

正在加载...
取消
保存