From f85e395b4ae03bc2d89d16c3a0de1e7cedf5dae9 Mon Sep 17 00:00:00 2001 From: JBYoshi Date: Tue, 24 Nov 2015 09:12:52 -0600 Subject: [PATCH] Add a message for "not a Git repository". Use Constants.DOT_GIT. --- src/main/java/jbyoshi/gitupdate/GitUpdate.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/jbyoshi/gitupdate/GitUpdate.java b/src/main/java/jbyoshi/gitupdate/GitUpdate.java index 90d867e..68d26f1 100644 --- a/src/main/java/jbyoshi/gitupdate/GitUpdate.java +++ b/src/main/java/jbyoshi/gitupdate/GitUpdate.java @@ -19,6 +19,7 @@ import java.util.*; import org.eclipse.jgit.api.*; +import org.eclipse.jgit.errors.*; import org.eclipse.jgit.lib.*; import org.eclipse.jgit.submodule.*; @@ -66,6 +67,18 @@ public static void update(File repoDir, Task root) { try (Repository repo = new RepositoryBuilder().setWorkTree(repoDir).setMustExist(true).build()) { update(repo, root); } + } catch (RepositoryNotFoundException e) { + if (repoDir.getName().equals(Constants.DOT_GIT)) { + repoDir = repoDir.getParentFile(); + } + try { + repoDir = repoDir.toPath().toRealPath().toFile(); + } catch (IOException e1) { + repoDir = repoDir.toPath().normalize().toFile(); + } + if (updated.add(repoDir)) { + root.report.newChild(repoDir.getName() + " - not a Git repository"); + } } catch (IOException e) { e.printStackTrace(); } @@ -73,7 +86,7 @@ public static void update(File repoDir, Task root) { public static void update(Repository repo, Task root) { File dir = repo.getDirectory(); - if (dir.getName().equals(".git")) { + if (dir.getName().equals(Constants.DOT_GIT)) { dir = dir.getParentFile(); } try {