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 <robin.rosenberg@dewire.com>

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 60d92d6bebbaf52b811b1ef67fbb19323db5e6b3..f98cdfa4af9534dff0160634f09be5fecd4f2ea0 100644 (file)
--- 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 61a8ecc3837d6f006b97a6f03e66ff0ae5e0ea9a..e7051a1bdb0e78d35e664fd828a6dbe9a5c2588e 100644 (file)
--- 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 + ":");
                }