Re: [Fix v1] builtin/ls-files.c: add error check on lstat for modified files
- From
Ramsay Jones <ramsay@ramsayjones.plus.com>
- Date
- Feb 17, 2019, 17:04 UTC
- Message-ID
- <e762e80a-d1ef-f906-e128-03f35de3c3ba@ramsayjones.plus.com>
- In-Reply-To
- <20190217163456.17560-1-randall.s.becker@rogers.com>
On 17/02/2019 16:34, randall.s.becker@rogers.com wrote:
> From: "Randall S. Becker" <rsbecker@nexbridge.com> > > The result from lstat, checking whether a file has been deleted, is now > included priot to calling id_modified when showing modified files. Prior
s/priot/prior/; s/id_modified/ie_modified/
Show 16 quoted lines
> to this fix, it is possible that files that were deleted could show up > as being modified because the lstat error was unchecked. > > Reported-by: Joe Ranieri <jranieri@grammatech.com> > Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com> > --- > builtin/ls-files.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/ls-files.c b/builtin/ls-files.c > index 29a8762d4..fc21f4795 100644 > --- a/builtin/ls-files.c > +++ b/builtin/ls-files.c > @@ -348,7 +348,7 @@ static void show_files(struct repository *repo, struct dir_struct *dir) > err = lstat(fullname.buf, &st); > if (show_deleted && err)
To be pedantic, this should probably check for (err == ENOENT), since lstat() can fail for several reasons which don't imply that the path has been deleted. However, that is unlikely.
No reason to include such a check in this patch, of course.
ATB, Ramsay Jones
Show 7 quoted lines
> show_ce(repo, dir, ce, fullname.buf, tag_removed); > - if (show_modified && ie_modified(repo->index, ce, &st, 0)) > + if (show_modified && !err && ie_modified(repo->index, ce, &st, 0)) > show_ce(repo, dir, ce, fullname.buf, tag_modified); > } > } >