On Tue, Mar 17, 2009 at 02:41:50AM +0100, Jonas Bernoulli wrote:
> git ls-files --deleted seams to be broken when GIT_WORK_TREE is set as
> can be observed below.
>
> Instead of just showing deleted files it also shows at least unchanged
> and modified files.
>
> I have observed this behaviour with git.git and do not know if
> released versions are affected.
I don't think it has ever worked correctly. A fix is below, but I'm
really unsure if it is right. It seems like we should be able to just
refresh the index and see its status, rather than calling the lstat
ourselves. But perhaps this is an optimization to avoid refresh (see
builtin-ls-files.c, lines 186-202). Junio?
-- >8 --
Subject: [PATCH] ls-files: require worktree when --deleted is given
The code will end up calling lstat() to check whether the
file still exists; obviously this doesn't work if we're not
in the worktree.
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
The version in next has the same bug, but the code is totally different
due to parseopt-ification (but the fix is still a one-liner to set
require_work_tree when show_deleted is set).
builtin-ls-files.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index 9dec282..ca6f33d 100644
--- a/builtin-ls-files.c
+++ b/builtin-ls-files.c
@@ -419,6 +419,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
}
if (!strcmp(arg, "-d") || !strcmp(arg, "--deleted")) {
show_deleted = 1;
+ require_work_tree = 1;
continue;
}
if (!strcmp(arg, "-m") || !strcmp(arg, "--modified")) {
--
1.6.2.1.137.gb6aa78
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
