aboutsummaryrefslogtreecommitdiff
path: root/builtin-clean.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2009-02-16 13:20:25 +0100
committerJunio C Hamano <gitster@pobox.com>2009-02-18 11:04:19 -0800
commit7c4c97c0ac0cd66861d0c2b8bd7a47ed3c523ea7 (patch)
treefc42dc10878370068d77dbbfb94cb2475561a0b1 /builtin-clean.c
parent81d3fe9f4871e42ebd1af0221fa091fe5476e2f7 (diff)
downloadgit-7c4c97c0ac0cd66861d0c2b8bd7a47ed3c523ea7.tar.gz
git-7c4c97c0ac0cd66861d0c2b8bd7a47ed3c523ea7.tar.xz
Turn the flags in struct dir_struct into a single variable
By having flags represented as bits in the new member variable 'flags', it will be easier to use parse_options when dir_struct is involved. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-clean.c')
-rw-r--r--builtin-clean.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-clean.c b/builtin-clean.c
index f78c2fb10..c5ad33d3e 100644
--- a/builtin-clean.c
+++ b/builtin-clean.c
@@ -60,7 +60,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
memset(&dir, 0, sizeof(dir));
if (ignored_only)
- dir.show_ignored = 1;
+ dir.flags |= DIR_SHOW_IGNORED;
if (ignored && ignored_only)
die("-x and -X cannot be used together");
@@ -69,7 +69,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
die("clean.requireForce%s set and -n or -f not given; "
"refusing to clean", config_set ? "" : " not");
- dir.show_other_directories = 1;
+ dir.flags |= DIR_SHOW_OTHER_DIRECTORIES;
if (!ignored)
setup_standard_excludes(&dir);