From 589570dbe7d291e73defea367babb5400a87e9f0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 5 Jun 2012 22:21:42 -0700 Subject: 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. --- unpack-trees.h | 1 + 1 file changed, 1 insertion(+) (limited to 'unpack-trees.h') diff --git a/unpack-trees.h b/unpack-trees.h index 5e432f576e..ec74a9f19a 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]; -- cgit v1.2.3