diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-30 02:16:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-30 02:16:40 (GMT) |
| commit | 3c5a78280fa5535050fe83b51cafb9ca51e8d9e8 (patch) | |
| tree | c4872e1654f52d2e5e9c5160479b26c778697074 /t/t6134-pathspec-in-submodule.sh | |
| parent | 78089b71da60fcf846b2e7029a90db492f1d3a9d (diff) | |
| parent | 08de9151a8a67f29a3a5a36931298237d78ca736 (diff) | |
| download | git-3c5a78280fa5535050fe83b51cafb9ca51e8d9e8.zip git-3c5a78280fa5535050fe83b51cafb9ca51e8d9e8.tar.gz git-3c5a78280fa5535050fe83b51cafb9ca51e8d9e8.tar.bz2 | |
Merge branch 'bw/pathspec-sans-the-index'
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
Diffstat (limited to 't/t6134-pathspec-in-submodule.sh')
| -rwxr-xr-x | t/t6134-pathspec-in-submodule.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/t/t6134-pathspec-in-submodule.sh b/t/t6134-pathspec-in-submodule.sh index 99a8982..c670668 100755 --- a/t/t6134-pathspec-in-submodule.sh +++ b/t/t6134-pathspec-in-submodule.sh @@ -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 |