diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-08-13 18:14:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-13 14:14:42 -0700 |
| commit | 6d2df284e7f4d7cd9f46992282ef59a72a9db527 (patch) | |
| tree | e574b2e2c62144926ced7a251f82260a61211d16 /archive.c | |
| parent | 7f944e264ebe2fcf9a2c228a9fc9463ab3274d39 (diff) | |
dir.c: remove an implicit dependency on the_index in pathspec code
Make the match_patchspec API and friends take an index_state instead of assuming the_index in dir.c. All external call sites are converted blindly to keep the patch simple and retain current behavior. Individual call sites may receive further updates to use the right index instead of the_index. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'archive.c')
| -rw-r--r-- | archive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archive.c b/archive.c index 31de1bba52..c81e35bf23 100644 --- a/archive.c +++ b/archive.c @@ -313,7 +313,7 @@ static int reject_entry(const struct object_id *oid, struct strbuf *base, struct strbuf sb = STRBUF_INIT; strbuf_addbuf(&sb, base); strbuf_addstr(&sb, filename); - if (!match_pathspec(context, sb.buf, sb.len, 0, NULL, 1)) + if (!match_pathspec(&the_index, context, sb.buf, sb.len, 0, NULL, 1)) ret = READ_TREE_RECURSIVE; strbuf_release(&sb); } |