diff options
author | Jeff King <peff@peff.net> | 2007-06-12 23:42:14 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-06-13 00:41:52 -0700 |
commit | e96980ef8164f266308ea5fec536863a629866dc (patch) | |
tree | c5ad7657d86a172a6109b9f989f10c1f6c1e2648 /dir.h | |
parent | 2abd31b07864049f0352d86c0c90413123f40945 (diff) | |
download | git-e96980ef8164f266308ea5fec536863a629866dc.tar.gz |
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.h | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -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 */ }; |