motiejus
/
jgit
1
Fork 0
Code Releases Activity

Fix formatting and add missing braces in Repository#stripWorkDir 

Change-Id: I601d917f3741e0207a8ee7a365d9c2dea6422401
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2019-08-08 14:42:14 +02:00
parent 400bfd6665
commit a52b331d71
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
View File

@ -1536,10 +1536,11 @@ public static String stripWorkDir(File workDir, File file) {
final String filePath = file.getPath();
final String workDirPath = workDir.getPath();
if (filePath.length() <= workDirPath.length() ||
filePath.charAt(workDirPath.length()) != File.separatorChar ||
!filePath.startsWith(workDirPath)) {
File absWd = workDir.isAbsolute() ? workDir : workDir.getAbsoluteFile();
if (filePath.length() <= workDirPath.length()
|| filePath.charAt(workDirPath.length()) != File.separatorChar
|| !filePath.startsWith(workDirPath)) {
File absWd = workDir.isAbsolute() ? workDir
: workDir.getAbsoluteFile();
File absFile = file.isAbsolute() ? file : file.getAbsoluteFile();
if (absWd.equals(workDir) && absFile.equals(file)) {
return ""; //$NON-NLS-1$
@ -1548,8 +1549,9 @@ public static String stripWorkDir(File workDir, File file) {
}
String relName = filePath.substring(workDirPath.length() + 1);
if (File.separatorChar != '/')
if (File.separatorChar != '/') {
relName = relName.replace(File.separatorChar, '/');
}
return relName;
}