From: Johannes Schindelin Date: Thu, 16 Jan 2020 16:17:33 GMT Subject: Re: [PATCH] submodule add: show 'add --dry-run' stderr when aborting Message-ID: In-Reply-To: <20200108003121.28034-1-kyle@kyleam.com> Hi (in particular Junio), On Tue, 7 Jan 2020, Kyle Meyer wrote: > diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh > index 7f75bb1be6..42a00f95b9 100755 > --- a/t/t7400-submodule-basic.sh > +++ b/t/t7400-submodule-basic.sh > @@ -156,9 +156,9 @@ test_expect_success 'submodule add to .gitignored path fails' ' > ( > cd addtest-ignore && > cat <<-\EOF >expect && > - The following path is ignored by one of your .gitignore files: > + The following paths are ignored by one of your .gitignore files: > submod > - Use -f if you really want to add it. > + Use -f if you really want to add them. I think this got mis-merged when merging down `km/submodule-add-errmsg`: it needs to be prefixed with `hint:` because of `hw/advice-add-nothing`, i.e. -- snipsnap -- diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 42a00f95b9d..a6973a3003c 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -158,7 +158,7 @@ test_expect_success 'submodule add to .gitignored path fails' ' cat <<-\EOF >expect && The following paths are ignored by one of your .gitignore files: submod - Use -f if you really want to add them. + hint: Use -f if you really want to add them. EOF # Does not use test_commit due to the ignore echo "*" > .gitignore &&