Merge changes I8c06635c,I62d6de7d
* changes: Silence non-externalized string warning in CherryPickCommand Use try-with-resource to close resources in CherryPickCommand
This commit is contained in:
commit
297600f7c2
|
@ -123,8 +123,7 @@ public CherryPickResult call() throws GitAPIException, NoMessageException,
|
|||
List<Ref> cherryPickedRefs = new LinkedList<Ref>();
|
||||
checkCallable();
|
||||
|
||||
RevWalk revWalk = new RevWalk(repo);
|
||||
try {
|
||||
try (RevWalk revWalk = new RevWalk(repo)) {
|
||||
|
||||
// get the head commit
|
||||
Ref headRef = repo.getRef(Constants.HEAD);
|
||||
|
@ -153,7 +152,7 @@ public CherryPickResult call() throws GitAPIException, NoMessageException,
|
|||
ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo);
|
||||
merger.setWorkingTreeIterator(new FileTreeIterator(repo));
|
||||
merger.setBase(srcParent.getTree());
|
||||
merger.setCommitNames(new String[] { "BASE", ourName,
|
||||
merger.setCommitNames(new String[] { "BASE", ourName, //$NON-NLS-1$
|
||||
cherryPickName });
|
||||
if (merger.merge(newHead, srcCommit)) {
|
||||
if (AnyObjectId.equals(newHead.getTree().getId(), merger
|
||||
|
@ -194,8 +193,6 @@ public CherryPickResult call() throws GitAPIException, NoMessageException,
|
|||
MessageFormat.format(
|
||||
JGitText.get().exceptionCaughtDuringExecutionOfCherryPickCommand,
|
||||
e), e);
|
||||
} finally {
|
||||
revWalk.release();
|
||||
}
|
||||
return new CherryPickResult(newHead, cherryPickedRefs);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue