diff options
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java | 3 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java index 4c0ed386e8..fc701f3a54 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java @@ -666,6 +666,9 @@ public class DiffFormatter implements AutoCloseable { } private static byte[] writeGitLinkText(AbbreviatedObjectId id) { + if (id.toObjectId().equals(ObjectId.zeroId())) { + return EMPTY; + } return encodeASCII("Subproject commit " + id.name() //$NON-NLS-1$ + "\n"); //$NON-NLS-1$ } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java index 915066d58f..f6d1209cb5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java @@ -252,10 +252,10 @@ public class RepoProject implements Comparable<RepoProject> { /** * Add a bunch of copyfile configurations. * - * @param copyfiles + * @param copyFiles */ - public void addCopyFiles(Collection<CopyFile> copyfiles) { - this.copyfiles.addAll(copyfiles); + public void addCopyFiles(Collection<CopyFile> copyFiles) { + this.copyfiles.addAll(copyFiles); } /** @@ -288,13 +288,13 @@ public class RepoProject implements Comparable<RepoProject> { /** * Check if this sub repo is an ancestor of the given path. * - * @param path + * @param thatPath * path to be checked to see if it is within this repository * @return true if this sub repo is an ancestor of the given path. * @since 4.2 */ - public boolean isAncestorOf(String path) { - return path.startsWith(getPathWithSlash()); + public boolean isAncestorOf(String thatPath) { + return thatPath.startsWith(getPathWithSlash()); } @Override |