diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-29 03:34:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-29 03:34:41 (GMT) |
| commit | 4eeed27e16c71ceecdf5a2d51af4099bb12ff775 (patch) | |
| tree | 771f960fbcb7b98880e2625080b115ffe34f9b67 /wt-status.c | |
| parent | f1101cefbd32f7ab8250285f122f132d31ff5335 (diff) | |
| parent | 0d32c183b636ffba6462b21ed0c844b6cb887b3f (diff) | |
| download | git-4eeed27e16c71ceecdf5a2d51af4099bb12ff775.zip git-4eeed27e16c71ceecdf5a2d51af4099bb12ff775.tar.gz git-4eeed27e16c71ceecdf5a2d51af4099bb12ff775.tar.bz2 | |
Merge branch 'bw/dir-c-stops-relying-on-the-index'
API update.
* bw/dir-c-stops-relying-on-the-index:
dir: convert fill_directory to take an index
dir: convert read_directory to take an index
dir: convert read_directory_recursive to take an index
dir: convert open_cached_dir to take an index
dir: convert is_excluded to take an index
dir: convert prep_exclude to take an index
dir: convert add_excludes to take an index
dir: convert is_excluded_from_list to take an index
dir: convert last_exclude_matching_from_list to take an index
dir: convert dir_add* to take an index
dir: convert get_dtype to take index
dir: convert directory_exists_in_index to take index
dir: convert read_skip_worktree_file_from_index to take an index
dir: stop using the index compatibility macros
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c index 7daa532..f55f587 100644 --- a/wt-status.c +++ b/wt-status.c @@ -665,7 +665,7 @@ static void wt_status_collect_untracked(struct wt_status *s) dir.untracked = the_index.untracked; setup_standard_excludes(&dir); - fill_directory(&dir, &s->pathspec); + fill_directory(&dir, &the_index, &s->pathspec); for (i = 0; i < dir.nr; i++) { struct dir_entry *ent = dir.entries[i]; |