From e96980ef8164f266308ea5fec536863a629866dc Mon Sep 17 00:00:00 2001 From: Jeff King Date: Tue, 12 Jun 2007 23:42:14 +0200 Subject: 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 Signed-off-by: Jonas Fonseca Signed-off-by: Junio C Hamano --- dir.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'dir.h') diff --git a/dir.h b/dir.h index c94f3cb066..ec0e8ababc 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 */ }; -- cgit v1.2.3