summaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2007-06-12 21:42:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-13 07:41:52 (GMT)
commite96980ef8164f266308ea5fec536863a629866dc (patch)
treec5ad7657d86a172a6109b9f989f10c1f6c1e2648 /dir.h
parent2abd31b07864049f0352d86c0c90413123f40945 (diff)
downloadgit-e96980ef8164f266308ea5fec536863a629866dc.zip
git-e96980ef8164f266308ea5fec536863a629866dc.tar.gz
git-e96980ef8164f266308ea5fec536863a629866dc.tar.bz2
builtin-add: simplify (and increase accuracy of) exclude handling
Previously, the code would always set up the excludes, and then manually pick through the pathspec we were given, assuming that non-added but existing paths were just ignored. This was mostly correct, but would erroneously mark a totally empty directory as 'ignored'. Instead, we now use the collect_ignored option of dir_struct, which unambiguously tells us whether a path was ignored. This simplifies the code, and means empty directories are now just not mentioned at all. Furthermore, we now conditionally ask dir_struct to respect excludes, depending on whether the '-f' flag has been set. This means we don't have to pick through the result, checking for an 'ignored' flag; ignored entries were either added or not in the first place. We can safely get rid of the special 'ignored' flags to dir_entry, which were not used anywhere else. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.h')
-rw-r--r--dir.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/dir.h b/dir.h
index c94f3cb..ec0e8ab 100644
--- a/dir.h
+++ b/dir.h
@@ -13,9 +13,7 @@
struct dir_entry {
- unsigned int ignored : 1;
- unsigned int ignored_dir : 1;
- unsigned int len : 30;
+ unsigned int len;
char name[FLEX_ARRAY]; /* more */
};