Silence non-externalized string warning in CherryPickCommand
Change-Id: I8c06635ce655470b5b650fa5c0c546e64445420c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
parent
58c2c52219
commit
588965c6da
|
@ -152,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
|
||||||
|
|
Loading…
Reference in New Issue