Merge branch 'jk/remove-remote-helpers-in-python'

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index d4823c9d38e5e22dff62d979601e0b06b9c857f3..e1cf6d8547d4aa7f548fb80f0efb8f4e7b1d9c8e 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -220,6 +220,8 @@ static void show_files(struct dir_struct *dir)
 
        /* For cached/deleted files we don't need to even do the readdir */
        if (show_others || show_killed) {
+               if (!show_others)
+                       dir->flags |= DIR_COLLECT_KILLED_ONLY;
                fill_directory(dir, &pathspec);
                if (show_others)
                        show_other_files(dir);