From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Kyle Meyer <kyle@kyleam.com>, Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Yaroslav O Halchenko <debian@onerussian.com>
Subject: Re: [PATCH] submodule add: show 'add --dry-run' stderr when aborting
Date: Thu, 16 Jan 2020 17:17:33 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2001161711310.46@tvgsbejvaqbjf.bet> (raw)
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 &&
next prev parent reply other threads:[~2020-01-16 16:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-08 0:31 [PATCH] submodule add: show 'add --dry-run' stderr when aborting Kyle Meyer
2020-01-08 21:41 ` Josh Steadmon
2020-01-09 2:39 ` Kyle Meyer
2020-01-16 16:17 ` Johannes Schindelin [this message]
2020-01-16 20:23 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2001161711310.46@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=debian@onerussian.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kyle@kyleam.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).