t6134 test failure in 'pu'

t6134 test failure in 'pu'

[Ramsay Jones]

Hi Junio,

t6134 fails for me in 'pu', but I think it is just a question
of merge 641f3ad90a3 dropping the last line of the test from
the change introduced by commit bdab972153.

In other words, this fixes the test for me:

$ git diff
diff --git a/t/t6134-pathspec-in-submodule.sh b/t/t6134-pathspec-in-submodule.sh
index 6d5df294a..c67066840 100755
--- a/t/t6134-pathspec-in-submodule.sh
+++ b/t/t6134-pathspec-in-submodule.sh
@@ -26,6 +26,7 @@ test_expect_success 'error message for path inside submodule' '
 
 test_expect_success 'error message for path inside submodule from within submodule' '
        test_must_fail git -C sub add . 2>actual &&
+       test_i18ngrep "in unpopulated submodule" actual
 '
 
 test_done
$ 

Thanks!

ATB,
Ramsay Jones

Re: t6134 test failure in 'pu'

[Junio C Hamano]

Thanks for a quick report.  Yes, that was a stupid mismerge.

Will correct in my rerere database X-<.