motiejus
/
jgit
1
Fork 0
Code Releases Activity

Fix non-externalized string warnings in IndexDiff 

Change-Id: Ia803182114f0e8b418428e03601f9afc6542ed28
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2014-11-06 09:46:45 +01:00
parent 5328c8c916
commit d8fcc964a8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java
View File

@ -232,7 +232,7 @@ public boolean include(TreeWalk walker)
@Override @Override
public TreeFilter clone() { public TreeFilter clone() {
throw new IllegalStateException( throw new IllegalStateException(
"Do not clone this kind of filter: " "Do not clone this kind of filter: " //$NON-NLS-1$
+ getClass().getName()); + getClass().getName());
} }
} }
@ -530,7 +530,7 @@ public boolean diff(final ProgressMonitor monitor, int estWorkTreeSize,
+ smw.getPath()); + smw.getPath());
} }
Repository subRepo = smw.getRepository(); Repository subRepo = smw.getRepository();
ObjectId subHead = subRepo.resolve("HEAD"); ObjectId subHead = subRepo.resolve("HEAD"); //$NON-NLS-1$
if (subHead != null && !subHead.equals(smw.getObjectId())) if (subHead != null && !subHead.equals(smw.getObjectId()))
modified.add(smw.getPath()); modified.add(smw.getPath());
else if (ignoreSubmoduleMode != IgnoreSubmoduleMode.DIRTY) { else if (ignoreSubmoduleMode != IgnoreSubmoduleMode.DIRTY) {