summaryrefslogtreecommitdiff
path: root/builtin-ls-files.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2009-05-08 05:01:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-09 07:29:07 (GMT)
commite9008b9a44f46e97f39c424240ade0a6e6429cab (patch)
tree03ac089ef304acb9aa9146edcfe417e46bf8f671 /builtin-ls-files.c
parent2f4b97f91071f5060bf2da482cf8b0d70486d808 (diff)
downloadgit-e9008b9a44f46e97f39c424240ade0a6e6429cab.zip
git-e9008b9a44f46e97f39c424240ade0a6e6429cab.tar.gz
git-e9008b9a44f46e97f39c424240ade0a6e6429cab.tar.bz2
parseopt: add OPT_NEGBIT
On Thu, May 07, 2009 at 09:44:17PM +0200, René Scharfe wrote: Subject: [PATCH] ls-files: make --no-empty-directory properly negatable This option was specified to parseopt as an OPT_BIT; however, we actually want to _set_ the bit on --no-empty-directory. Thus the existing implementation used --no-empty-directory, and required --no-no-empty-directory to negate it. Now that OPT_NEGBIT exists, we can properly support it as --empty-directory and --no-empty-directory (but of course still defaulting to showing empty directories). 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index da2daf4..3d59b0e 100644
--- 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,