mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bw/pathspec-sans-the-index'

Browse Source 
Simplify parse_pathspec() codepath and stop it from looking at the
default in-core index.

* bw/pathspec-sans-the-index:
  pathspec: convert find_pathspecs_matching_against_index to take an index
  pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP
  ls-files: prevent prune_cache from overeagerly pruning submodules
  pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE flag
  submodule: add die_in_unpopulated_submodule function
  pathspec: provide a more descriptive die message
This commit is contained in:
Junio C Hamano
2017-05-30 11:16:40 +09:00
parent 78089b71da 08de9151a8
commit 3c5a78280f
11 changed files with 124 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
t/t6134-pathspec-in-submodule.sh
View File

@ -24,13 +24,9 @@ test_expect_success 'error message for path inside submodule' '
test_i18ncmp expect actual
'
cat <<EOF >expect
fatal: Pathspec '.' is in submodule 'sub'
EOF
test_expect_success 'error message for path inside submodule from within submodule' '
test_must_fail git -C sub add . 2>actual &&
test_i18ncmp expect actual
test_i18ngrep "in unpopulated submodule" actual
'
test_done