[PATCH v7 1/3] ls_files.c: bugfix for --deleted and --modified
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 23, 2021, 19:53 UTC
- Message-ID
- <20210123195334.2970374-1-gitster@pobox.com>
- In-Reply-To
- <pull.832.v6.git.1611397210.gitgitgadget@gmail.com>
From: ZheNing Hu <adlternative@gmail.com>
This situation may occur in the original code: lstat() failed but we use `&st` to feed ie_modified() later.
Therefore, we can directly execute show_ce without the judgment of ie_modified() when lstat() has failed.
Signed-off-by: ZheNing Hu <adlternative@gmail.com> [jc: fixed misindented code] Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/ls-files.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/builtin/ls-files.c b/builtin/ls-files.c index c8eae899b8..ce6f6ad00e 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -335,7 +335,7 @@ static void show_files(struct repository *repo, struct dir_struct *dir) for (i = 0; i < repo->index->cache_nr; i++) { const struct cache_entry *ce = repo->index->cache[i]; struct stat st; - int err; + int stat_err; construct_fullname(&fullname, repo, ce); @@ -346,10 +346,13 @@ static void show_files(struct repository *repo, struct dir_struct *dir) continue; if (ce_skip_worktree(ce)) continue; - err = lstat(fullname.buf, &st); - if (show_deleted && err) + stat_err = lstat(fullname.buf, &st); + if (stat_err && (errno != ENOENT && errno != ENOTDIR)) + error_errno("cannot lstat '%s'", fullname.buf); + if (stat_err && show_deleted) show_ce(repo, dir, ce, fullname.buf, tag_removed); - if (show_modified && ie_modified(repo->index, ce, &st, 0)) + if (show_modified && + (stat_err || ie_modified(repo->index, ce, &st, 0))) show_ce(repo, dir, ce, fullname.buf, tag_modified); } }
-- 2.30.0-491-g302c625a7b