diff options
| author | Karsten Blees <karsten.blees@gmail.com> | 2013-04-15 21:12:57 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-15 12:34:01 -0700 |
| commit | b07bc8c8c3c492d657a8bedf04ff939763ea8222 (patch) | |
| tree | d4d0bad28133aa9e14576c380d244ffd25dbf9e6 /unpack-trees.c | |
| parent | 95c6f27164b58152efcfb5aaf6164030f10d9459 (diff) | |
| download | git-b07bc8c8c3c492d657a8bedf04ff939763ea8222.tar.gz git-b07bc8c8c3c492d657a8bedf04ff939763ea8222.tar.xz | |
dir.c: replace is_path_excluded with now equivalent is_excluded API
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 09e53df3b..ede4299b8 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1026,10 +1026,6 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options o->el = ⪙ } - if (o->dir) { - o->path_exclude_check = xmalloc(sizeof(struct path_exclude_check)); - path_exclude_check_init(o->path_exclude_check, o->dir); - } memset(&o->result, 0, sizeof(o->result)); o->result.initialized = 1; o->result.timestamp.sec = o->src_index->timestamp.sec; @@ -1155,10 +1151,6 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options done: clear_exclude_list(&el); - if (o->path_exclude_check) { - path_exclude_check_clear(o->path_exclude_check); - free(o->path_exclude_check); - } return ret; return_failed: @@ -1375,7 +1367,7 @@ static int check_ok_to_remove(const char *name, int len, int dtype, return 0; if (o->dir && - is_path_excluded(o->path_exclude_check, name, -1, &dtype)) + is_excluded(o->dir, name, &dtype)) /* * ce->name is explicitly excluded, so it is Ok to * overwrite it. |