motiejus
/
jgit
1
Fork 0
Code Releases Activity

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:
Shawn Pearce 2015-04-08 15:30:49 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent ba8b275ac5 588965c6da
commit 297600f7c2
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,8 +123,7 @@ public CherryPickResult call() throws GitAPIException, NoMessageException,
List<Ref> cherryPickedRefs = new LinkedList<Ref>(); List<Ref> cherryPickedRefs = new LinkedList<Ref>();
checkCallable(); checkCallable();
RevWalk revWalk = new RevWalk(repo); try (RevWalk revWalk = new RevWalk(repo)) {
try {
// get the head commit // get the head commit
Ref headRef = repo.getRef(Constants.HEAD); Ref headRef = repo.getRef(Constants.HEAD);
@ -153,7 +152,7 @@ public CherryPickResult call() throws GitAPIException, NoMessageException,
ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo); ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo);
merger.setWorkingTreeIterator(new FileTreeIterator(repo)); merger.setWorkingTreeIterator(new FileTreeIterator(repo));
merger.setBase(srcParent.getTree()); merger.setBase(srcParent.getTree());
merger.setCommitNames(new String[] { "BASE", ourName, merger.setCommitNames(new String[] { "BASE", ourName, //$NON-NLS-1$
cherryPickName }); cherryPickName });
if (merger.merge(newHead, srcCommit)) { if (merger.merge(newHead, srcCommit)) {
if (AnyObjectId.equals(newHead.getTree().getId(), merger if (AnyObjectId.equals(newHead.getTree().getId(), merger
@ -194,8 +193,6 @@ public CherryPickResult call() throws GitAPIException, NoMessageException,
MessageFormat.format( MessageFormat.format(
JGitText.get().exceptionCaughtDuringExecutionOfCherryPickCommand, JGitText.get().exceptionCaughtDuringExecutionOfCherryPickCommand,
e), e); e), e);
} finally {
revWalk.release();
} }
return new CherryPickResult(newHead, cherryPickedRefs); return new CherryPickResult(newHead, cherryPickedRefs);
} }