diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-10-05 14:01:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-05 14:01:52 -0700 |
| commit | 19dd352d03adc75d0b6530975a44b7bb23c69063 (patch) | |
| tree | 004d7ebcd753d22060530bbe149a15d7d5df6fc2 /dir.c | |
| parent | 8250ab0b8c814ce4491b57a52c7d6d95fa01d992 (diff) | |
| parent | 842385b8a4fa56678f13cda599ee96463004e7bf (diff) | |
| download | git-19dd352d03adc75d0b6530975a44b7bb23c69063.tar.gz | |
Merge branch 'jk/unused'
Code cleanup.
* jk/unused:
dir.c: drop unused "untracked" from treat_path_fast()
sequencer: handle ignore_footer when parsing trailers
test-advise: check argument count with argc instead of argv
sparse-checkout: fill in some options boilerplate
sequencer: drop repository argument from run_git_commit()
push: drop unused repo argument to do_push()
assert PARSE_OPT_NONEG in parse-options callbacks
env--helper: write to opt->value in parseopt helper
drop unused argc parameters
convert: drop unused crlf_action from check_global_conv_flags_eol()
Diffstat (limited to 'dir.c')
| -rw-r--r-- | dir.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -2105,7 +2105,6 @@ static int resolve_dtype(int dtype, struct index_state *istate, } static enum path_treatment treat_path_fast(struct dir_struct *dir, - struct untracked_cache_dir *untracked, struct cached_dir *cdir, struct index_state *istate, struct strbuf *path, @@ -2153,7 +2152,7 @@ static enum path_treatment treat_path(struct dir_struct *dir, int has_path_in_index, dtype, excluded; if (!cdir->d_name) - return treat_path_fast(dir, untracked, cdir, istate, path, + return treat_path_fast(dir, cdir, istate, path, baselen, pathspec); if (is_dot_or_dotdot(cdir->d_name) || !fspathcmp(cdir->d_name, ".git")) return path_none; |