path: root/unpack-trees.h
diff options
authorJunio C Hamano <>2012-06-06 05:21:42 (GMT)
committerJunio C Hamano <>2012-06-06 05:21:42 (GMT)
commit589570dbe7d291e73defea367babb5400a87e9f0 (patch)
treea00c6d6bd1831d646787b5b5c87eaca13904b345 /unpack-trees.h
parenteb69934bbd1200a318422c0d127c043d6b8457e1 (diff)
unpack-trees.c: use path_excluded() in check_ok_to_remove()
This function is responsible for determining if a path that is not tracked is ignored and allow "checkout" to overwrite it as needed. It used excluded() without checking if higher level directory in the path is ignored; correct it to use path_excluded() for this check. Signed-off-by: Junio C Hamano <> --- * There are uses of lower-level interface excluded_from_list() in the codepath for narrow-checkout hack; they are supposed to be already checking each level as they descend, and are not touched with this patch.
Diffstat (limited to 'unpack-trees.h')
1 files changed, 1 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h
index 5e432f5..ec74a9f 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -52,6 +52,7 @@ struct unpack_trees_options {
const char *prefix;
int cache_bottom;
struct dir_struct *dir;
+ struct path_exclude_check *path_exclude_check;
struct pathspec *pathspec;
merge_fn_t fn;
const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];