Browse Source

Silence non-externalized string warning in CherryPickCommand

Change-Id: I8c06635ce655470b5b650fa5c0c546e64445420c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-4.1
Matthias Sohn 10 years ago
parent
commit
588965c6da
  1. 2
      org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java

2
org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java

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

Loading…
Cancel
Save