From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 May 2017 02:16:40 +0000 (+0900)
Subject: Merge branch 'bw/pathspec-sans-the-index'
X-Git-Tag: v2.14.0-rc0~147
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3c5a78280fa5535050fe83b51cafb9ca51e8d9e8

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
---

3c5a78280fa5535050fe83b51cafb9ca51e8d9e8
diff --cc t/t6134-pathspec-in-submodule.sh
index 99a8982ab1,0f1cb49ced..c670668409
--- a/t/t6134-pathspec-in-submodule.sh
+++ b/t/t6134-pathspec-in-submodule.sh
@@@ -21,16 -21,12 +21,12 @@@ EO
  test_expect_success 'error message for path inside submodule' '
  	echo a >sub/a &&
  	test_must_fail git add sub/a 2>actual &&
 -	test_cmp expect actual
 +	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