aboutsummaryrefslogtreecommitdiff
path: root/builtin-ls-files.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2009-03-07 20:27:22 -0500
committerJunio C Hamano <gitster@pobox.com>2009-03-07 19:54:57 -0800
commit2fb6d6d6dd1033bfe82d6d327ac270f9cf8943cd (patch)
tree4ad772a1c83a7c7665c9f086ab7cce3f7be4b77e /builtin-ls-files.c
parent8a3b25da8cdd7f3aa75f18d3245ce83aca90bb1a (diff)
downloadgit-2fb6d6d6dd1033bfe82d6d327ac270f9cf8943cd.tar.gz
git-2fb6d6d6dd1033bfe82d6d327ac270f9cf8943cd.tar.xz
ls-files: fix broken --no-empty-directory
Commit ce8e880 converted ls-files to use parseopt; the --no-empty-directory option was converted as an OPT_BIT for "empty-directory" to set the DIR_HIDE_EMPTY_DIRECTORY flag. However, that makes it do the opposite of what it should: --empty-directory would hide, but --no-empty-directory would turn off hiding. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-ls-files.c')
-rw-r--r--builtin-ls-files.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index 1742c0f80..437c366c9 100644
--- 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"),