Sync with GIT 1.6.2.5

diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index 437c366c9e7875aa5003419f1eb03c600b1a1f6f..da2daf45acd2154b7f00da34d41a5ab8acaf0c38 100644 (file)
--- a/builtin-ls-files.c
+++ b/builtin-ls-files.c
@@ -496,7 +496,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
                tag_other = "? ";
                tag_killed = "K ";
        }
-       if (show_modified || show_others || (dir.flags & DIR_SHOW_IGNORED) || show_killed)
+       if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed)
                require_work_tree = 1;
        if (show_unmerged)
                /*
@@ -512,7 +512,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
 
        pathspec = get_pathspec(prefix, argv);
 
-       /* be nice with submodule patsh ending in a slash */
+       /* be nice with submodule paths ending in a slash */
        read_cache();
        if (pathspec)
                strip_trailing_slash_from_submodules();