diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-16 14:33:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-16 14:33:47 -0700 |
| commit | dfb67594e964e63f20546361597c06432c73779d (patch) | |
| tree | 3ea858127e139ee620a010f4ba82aa95b9fca77c /submodule.c | |
| parent | 2cd8ebdd3d28359b7886d994e84a8725394935e7 (diff) | |
| parent | 22570b68e3cb9380403d903680be3b3112a26490 (diff) | |
| download | git-dfb67594e964e63f20546361597c06432c73779d.tar.gz | |
Merge branch 'rs/janitorial' into maint
Code clean-up.
* rs/janitorial:
dir: remove unused variable sb
clean: remove unused variable buf
use file_exists() to check if a file exists in the worktree
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/submodule.c b/submodule.c index c0e6c81fc4..5a563ad100 100644 --- a/submodule.c +++ b/submodule.c @@ -891,7 +891,6 @@ int submodule_uses_gitfile(const char *path) int ok_to_remove_submodule(const char *path) { - struct stat st; ssize_t len; struct child_process cp = CHILD_PROCESS_INIT; const char *argv[] = { @@ -904,7 +903,7 @@ int ok_to_remove_submodule(const char *path) struct strbuf buf = STRBUF_INIT; int ok_to_remove = 1; - if ((lstat(path, &st) < 0) || is_empty_dir(path)) + if (!file_exists(path) || is_empty_dir(path)) return 1; if (!submodule_uses_gitfile(path)) |