From: Stefan Beller Date: Thu, 23 Mar 2017 22:33:36 GMT Subject: [PATCH 5/7] submodule.c: stricter checking for submodules in is_submodule_modified Message-ID: <20170323223338.32274-6-sbeller@google.com> In-Reply-To: <20170323223338.32274-1-sbeller@google.com> By having a stricter check in the superproject we catch errors earlier, instead of spawning a child process to tell us. Reviewed-by: Jonathan Nieder Signed-off-by: Stefan Beller --- submodule.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/submodule.c b/submodule.c index 93d6f08b50..e06e52b993 100644 --- a/submodule.c +++ b/submodule.c @@ -1050,11 +1050,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); -- 2.12.1.438.gb674c4c09c