git-am: refactor 'cleaning up and aborting'

diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index 88e2697aebf11399baf9f9c8b5a63b06a0f83c1d..3d59b0e140ca199997704ffcf59fbc2138345168 100644 (file)
--- a/builtin-ls-files.c
+++ b/builtin-ls-files.c
@@ -454,7 +454,7 @@ 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, "no-empty-directory", &dir.flags,
+               OPT_NEGBIT(0, "empty-directory", &dir.flags,
                        "don't show empty directories",
                        DIR_HIDE_EMPTY_DIRECTORIES),
                OPT_BOOLEAN('u', "unmerged", &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();