undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule.c: stricter checking for submodules in is_submodule_modified

Browse Source 
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 <sbeller@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller 2017-03-24 17:36:08 -07:00 committed by Junio C Hamano
parent fcecf0b968
commit 5c896f7c3e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
submodule.c
View File

@ -1052,11 +1052,12 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
git_dir = read_gitfile(buf.buf); git_dir = read_gitfile(buf.buf);
if (!git_dir) if (!git_dir)
git_dir = buf.buf; 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); strbuf_release(&buf);
/* The submodule is not checked out, so it is not modified */ /* The submodule is not checked out, so it is not modified */
return 0; return 0;
} }
strbuf_reset(&buf); strbuf_reset(&buf);