Docs: send-email: --smtp-server-port can take symbolic ports

diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index 1742c0f80d0167b84f1615fb8c6c93ad87e95938..88e2697aebf11399baf9f9c8b5a63b06a0f83c1d 100644 (file)
--- a/builtin-ls-files.c
+++ b/builtin-ls-files.c
@@ -454,8 +454,8 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
                OPT_BIT(0, "directory", &dir.flags,
                        "show 'other' directories' name only",
                        DIR_SHOW_OTHER_DIRECTORIES),
-               OPT_BIT(0, "empty-directory", &dir.flags,
-                       "list empty directories",
+               OPT_BIT(0, "no-empty-directory", &dir.flags,
+                       "don't show empty directories",
                        DIR_HIDE_EMPTY_DIRECTORIES),
                OPT_BOOLEAN('u', "unmerged", &show_unmerged,
                        "show unmerged files in the output"),
@@ -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)
                /*