diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-11-29 02:17:44 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-11-29 02:19:14 -0800 |
commit | 63d285c8494d03a08600bb4453fcce077ecdd517 (patch) | |
tree | 4c0d3d0e9ea9a5a420fbcbbd61249b109b387568 /unpack-trees.c | |
parent | 686a4a06b679a202430ca81267ad6505e92d839a (diff) | |
download | git-63d285c8494d03a08600bb4453fcce077ecdd517.tar.gz |
per-directory-exclude: lazily read .gitignore files
Operations that walk directories or trees, which potentially need to
consult the .gitignore files, used to always try to open the .gitignore
file every time they entered a new directory, even when they ended up
not needing to call excluded() function to see if a path in the
directory is ignored. This was done by push/pop exclude_per_directory()
functions that managed the data in a stack.
This changes the directory walking API to remove the need to call these
two functions. Instead, the directory walk data structure caches the
data used by excluded() function the last time, and lazily reuses it as
much as possible. Among the data the last check used, the ones from
deeper directories that the path we are checking is outside are
discarded, data from the common leading directories are reused, and then
the directories between the common directory and the directory the path
being checked is in are checked for .gitignore file. This is very
similar to the way gitattributes are handled.
This API change also fixes "ls-files -c -i", which called excluded()
without setting up the gitignore data via the old push/pop functions.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
-rw-r--r-- | unpack-trees.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index aea16adde8..e9eb795d64 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -71,12 +71,8 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len, int remove; int baselen = strlen(base); int src_size = len + 1; - int i_stk = i_stk; int retval = 0; - if (o->dir) - i_stk = push_exclude_per_directory(o->dir, base, strlen(base)); - do { int i; const char *first; @@ -255,8 +251,6 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len, } while (1); leave_directory: - if (o->dir) - pop_exclude_per_directory(o->dir, i_stk); return retval; } |