Fix for Repository.stripWorkDir when using partial paths

index 468cf4c..a68817b 100644
@@ -1036,7 +1036,7 @@ public static boolean isValidRefName(final String refName) {
 	 * @return normalized repository relative path
 	 */
 	public static String stripWorkDir(File wd, File f) {
-		String relName = f.getPath().substring(wd.getPath().length() + 1);
+		String relName = f.getAbsolutePath().substring(wd.getPath().length() + 1);
 		relName = relName.replace(File.separatorChar, '/');
 		return relName;
 	}

index 3660b45..c2b1b91 100644
@@ -545,6 +545,31 @@ public void test029_mapObject() throws IOException {
 		assertEquals(Commit.class, db.mapObject(ObjectId.fromString("540a36d136cf413e4b064c2b0e0a4db60f77feab"), null).getClass());
 		assertEquals(Tree.class, db.mapObject(ObjectId.fromString("aabf2ffaec9b497f0950352b3e582d73035c2035"), null).getClass());
 		assertEquals(Tag.class, db.mapObject(ObjectId.fromString("17768080a2318cd89bba4c8b87834401e2095703"), null).getClass());
+	}
+
+	public void test30_stripWorkDir() {
+		File relCwd = new File(".");
+		File absCwd = relCwd.getAbsoluteFile();
+		File absBase = new File(new File(absCwd, "repo"), "workdir");
+		File relBase = new File(new File(relCwd, "repo"), "workdir");
+		assertEquals(absBase.getAbsolutePath(), relBase.getAbsolutePath());
+
+		File relBaseFile = new File(new File(relBase, "other"), "module.c");
+		File absBaseFile = new File(new File(absBase, "other"), "module.c");
+		assertEquals("other/module.c", Repository.stripWorkDir(relBase, relBaseFile));
+		assertEquals("other/module.c", Repository.stripWorkDir(relBase, absBaseFile));
+		assertEquals("other/module.c", Repository.stripWorkDir(absBase, relBaseFile));
+		assertEquals("other/module.c", Repository.stripWorkDir(absBase, absBaseFile));
+
+		File relNonFile = new File(new File(relCwd, "not-repo"), ".gitignore");
+		File absNonFile = new File(new File(absCwd, "not-repo"), ".gitignore");
+		assertEquals("", Repository.stripWorkDir(relBase, relNonFile));
+		assertEquals("", Repository.stripWorkDir(absBase, absNonFile));
+
+		assertEquals("", Repository.stripWorkDir(db.getWorkDir(), db.getWorkDir()));
+
+		File file = new File(new File(db.getWorkDir(), "subdir"), "File.java");
+		assertEquals("subdir/File.java", Repository.stripWorkDir(db.getWorkDir(), file));
 
 	}
 }

index d6be9bf..46b7804 100644
@@ -729,7 +729,7 @@ else if (item.equals("")) {
 					}
 				}
 				if (time != null)
-					throw new RevisionSyntaxException("reflogs not yet supported by revision parser yet", revstr);
+					throw new RevisionSyntaxException("reflogs not yet supported by revision parser", revstr);
 				i = m - 1;
 				break;
 			default:

@@ -1029,15 +1029,30 @@ public static boolean isValidRefName(final String refName) {
 	}
 
 	/**
-	 * Strip work dir and return normalized repository path
+	 * Strip work dir and return normalized repository path.
 	 *
-	 * @param wd Work dir
-	 * @param f File whose path shall be stripped of its workdir
-	 * @return normalized repository relative path
+	 * @param workDir Work dir
+	 * @param file File whose path shall be stripped of its workdir
+	 * @return normalized repository relative path or the empty
+	 *         string if the file is not relative to the work directory.
 	 */
-	public static String stripWorkDir(File wd, File f) {
-		String relName = f.getPath().substring(wd.getPath().length() + 1);
-		relName = relName.replace(File.separatorChar, '/');
+	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();
+			File absFile = file.isAbsolute() ? file : file.getAbsoluteFile();
+			if (absWd == workDir && absFile == file)
+				return "";
+			return stripWorkDir(absWd, absFile);
+		}
+
+		String relName = filePath.substring(workDirPath.length() + 1);
+		if (File.separatorChar != '/')
+			relName = relName.replace(File.separatorChar, '/');
 		return relName;
 	}