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 <gitster@pobox.com> --- * 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.
Junio C Hamano committed
Jun 5, 2012 at 22:21 UTC
589570dbe7d291e73defea367babb5400a87e9f0
2 files changed
+11
-1
unpack-trees.c
+10
-1
@@ -1016,6 +1016,10 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
1016
o->el = ⪙
1017
}
1018
1019
+ if (o->dir) {
1020
+ o->path_exclude_check = xmalloc(sizeof(struct path_exclude_check));
1021
+ path_exclude_check_init(o->path_exclude_check, o->dir);
1022
+ }
1023
memset(&o->result, 0, sizeof(o->result));
1024
o->result.initialized = 1;
1025
o->result.timestamp.sec = o->src_index->timestamp.sec;
@@ -1140,6 +1144,10 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
1144
1145
done:
1146
free_excludes(&el);
1147
+ if (o->path_exclude_check) {
1148
+ path_exclude_check_clear(o->path_exclude_check);
1149
+ free(o->path_exclude_check);
1150
+ }
1151
return ret;
1152
1153
return_failed:
@@ -1355,7 +1363,8 @@ static int check_ok_to_remove(const char *name, int len, int dtype,
1363
if (ignore_case && icase_exists(o, name, len, st))
1364
return 0;
1365
1358
- if (o->dir && excluded(o->dir, name, &dtype))
1366
+ if (o->dir &&
1367
+ path_excluded(o->path_exclude_check, name, -1, &dtype))
1368
/*
1369
* ce->name is explicitly excluded, so it is Ok to
1370
* overwrite it.
unpack-trees.h
+1
@@ -52,6 +52,7 @@ struct unpack_trees_options {
52
const char *prefix;
53
int cache_bottom;
54
struct dir_struct *dir;
55
+ struct path_exclude_check *path_exclude_check;
56
struct pathspec *pathspec;
57
merge_fn_t fn;
58
const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];