From 5c896f7c3ec69f017d1e1be4164d558918f3ae4c Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Fri, 24 Mar 2017 17:36:08 -0700 Subject: submodule.c: stricter checking for submodules in is_submodule_modified By having a stricter check in the superproject we catch errors earlier, instead of spawning a child process to tell us. Signed-off-by: Stefan Beller Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano diff --git a/submodule.c b/submodule.c index 5865795..fa21c7b 100644 --- a/submodule.c +++ b/submodule.c @@ -1052,11 +1052,12 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked) git_dir = read_gitfile(buf.buf); if (!git_dir) git_dir = buf.buf; - if (!is_directory(git_dir)) { + if (!is_git_directory(git_dir)) { + if (is_directory(git_dir)) + die(_("'%s' not recognized as a git repository"), git_dir); strbuf_release(&buf); /* The submodule is not checked out, so it is not modified */ return 0; - } strbuf_reset(&buf); -- cgit v0.10.2-6-g49f6