diff options
Diffstat (limited to 'org.eclipse.jgit.pgm')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java | 10 | ||||
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java index 77ed73048d..ebdb74f3c7 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java @@ -153,22 +153,22 @@ class Diff extends TextBuiltin { for (DiffEntry ent : files) { switch (ent.getChangeType()) { case ADD: - out.println("A\t" + ent.getNewName()); + out.println("A\t" + ent.getNewPath()); break; case DELETE: - out.println("D\t" + ent.getOldName()); + out.println("D\t" + ent.getOldPath()); break; case MODIFY: - out.println("M\t" + ent.getNewName()); + out.println("M\t" + ent.getNewPath()); break; case COPY: out.format("C%1$03d\t%2$s\t%3$s", ent.getScore(), // - ent.getOldName(), ent.getNewName()); + ent.getOldPath(), ent.getNewPath()); out.println(); break; case RENAME: out.format("R%1$03d\t%2$s\t%3$s", ent.getScore(), // - ent.getOldName(), ent.getNewName()); + ent.getOldPath(), ent.getNewPath()); out.println(); break; } diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java index 48a05915e4..fbc019fa24 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java @@ -242,7 +242,7 @@ class Log extends RevWalkTextBuiltin { String oldPath = ((FollowFilter) pathFilter).getPath(); for (DiffEntry ent : files) { if (ent.getChangeType() == ChangeType.ADD - && ent.getNewName().equals(oldPath)) + && ent.getNewPath().equals(oldPath)) return true; } return false; @@ -251,8 +251,8 @@ class Log extends RevWalkTextBuiltin { private List<DiffEntry> updateFollowFilter(List<DiffEntry> files) { String oldPath = ((FollowFilter) pathFilter).getPath(); for (DiffEntry ent : files) { - if (isRename(ent) && ent.getNewName().equals(oldPath)) { - pathFilter = FollowFilter.create(ent.getOldName()); + if (isRename(ent) && ent.getNewPath().equals(oldPath)) { + pathFilter = FollowFilter.create(ent.getOldPath()); return Collections.singletonList(ent); } } |