From dcd4c5a642cdc65c1ea9ae2e8f26fdbdf8ac64fa Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Sat, 27 Aug 2011 16:58:26 +0200 Subject: [PATCH] Use the appropriate constant for ".git" We have two constants with the same content. DOT_GIT is intended for the git repository below the work tree, while DOT_GIT_EXT is the ".git" directory extension usually associated with bare repositories. Change-Id: I0946b4beb2d1c3af289ddbbb5641d2f4e4c49d3f Signed-off-by: Robin Rosenberg --- .../src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java | 2 +- .../src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java index 60d92d6be..f98cdfa4a 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java @@ -243,7 +243,7 @@ class DiffAlgorithms extends TextBuiltin { if (db.getDirectory() != null) { String name = db.getDirectory().getName(); File parent = db.getDirectory().getParentFile(); - if (name.equals(Constants.DOT_GIT_EXT) && parent != null) + if (name.equals(Constants.DOT_GIT) && parent != null) name = parent.getName(); out.println(name + ": start at " + startId.name()); } diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java index 61a8ecc38..e7051a1bd 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java @@ -342,7 +342,7 @@ class TextHashFunctions extends TextBuiltin { if (db.getDirectory() != null) { String name = db.getDirectory().getName(); File parent = db.getDirectory().getParentFile(); - if (name.equals(Constants.DOT_GIT_EXT) && parent != null) + if (name.equals(Constants.DOT_GIT) && parent != null) name = parent.getName(); out.println(name + ":"); }