Andrew's git / gitweb.git / diff
?
Merge branch 'jk/no-no-no-empty-directory'
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:38:35 +0000 (01:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:38:35 +0000 (01:38 -0700)
* jk/no-no-no-empty-directory:
parseopt: add OPT_NEGBIT

builtin-ls-files.c patch | blob | history
diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index da2daf45acd2154b7f00da34d41a5ab8acaf0c38..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,