Merge branch 'jk/no-no-no-empty-directory'

gitster · gitster · commit 15d29dde0484 · 2009-05-23T01:38:35.000-07:00
* jk/no-no-no-empty-directory:
  parseopt: add OPT_NEGBIT
diff --git 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,
