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 23:14:42 +0200 |
| commit | 6d2df284e7f4d7cd9f46992282ef59a72a9db527 (patch) | |
| tree | e574b2e2c62144926ced7a251f82260a61211d16 /revision.c | |
| parent | convert.c: remove an implicit dependency on the_index (diff) | |
| download | git-6d2df284e7f4d7cd9f46992282ef59a72a9db527.tar.xz git-6d2df284e7f4d7cd9f46992282ef59a72a9db527.zip | |
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 'revision.c')
| -rw-r--r-- | revision.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c index 0627494378..de4dce600d 100644 --- a/revision.c +++ b/revision.c @@ -1517,7 +1517,7 @@ static void prepare_show_merge(struct rev_info *revs) const struct cache_entry *ce = active_cache[i]; if (!ce_stage(ce)) continue; - if (ce_path_match(ce, &revs->prune_data, NULL)) { + if (ce_path_match(&the_index, ce, &revs->prune_data, NULL)) { prune_num++; REALLOC_ARRAY(prune, prune_num); prune[prune_num-2] = ce->name; |