]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'en/fill-directory-exponential'
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2020 23:15:30 +0000 (16:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2020 23:15:31 +0000 (16:15 -0700)
The directory traversal code had redundant recursive calls which
made its performance characteristics exponential with respect to
the depth of the tree, which was corrected.

* en/fill-directory-exponential:
  completion: fix 'git add' on paths under an untracked directory
  Fix error-prone fill_directory() API; make it only return matches
  dir: replace double pathspec matching with single in treat_directory()
  dir: include DIR_KEEP_UNTRACKED_CONTENTS handling in treat_directory()
  dir: replace exponential algorithm with a linear one
  dir: refactor treat_directory to clarify control flow
  dir: fix confusion based on variable tense
  dir: fix broken comment
  dir: consolidate treat_path() and treat_one_path()
  dir: fix simple typo in comment
  t3000: add more testcases testing a variety of ls-files issues
  t7063: more thorough status checking

1  2 
builtin/clean.c
builtin/grep.c
builtin/stash.c
contrib/completion/git-completion.bash
dir.c
t/t7063-status-untracked-cache.sh
t/t9902-completion.sh

diff --cc builtin/clean.c
Simple merge
diff --cc builtin/grep.c
Simple merge
diff --cc builtin/stash.c
Simple merge
diff --cc dir.c
Simple merge
Simple merge
Simple merge