summaryrefslogtreecommitdiff
path: root/t/t7400-submodule-basic.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-02-14 20:54:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-14 20:54:19 (GMT)
commitdaef1b300b07c3d17d47c3bf01ebde28b62ff3fe (patch)
tree3907573bbdd40095398e9cd159d3e971d4233a18 /t/t7400-submodule-basic.sh
parentd8437c57fa0752716dde2d3747e7c22bf7ce2e41 (diff)
parent887a0fd57336dc5ff3ac28b6de0be91278e9e179 (diff)
downloadgit-daef1b300b07c3d17d47c3bf01ebde28b62ff3fe.zip
git-daef1b300b07c3d17d47c3bf01ebde28b62ff3fe.tar.gz
git-daef1b300b07c3d17d47c3bf01ebde28b62ff3fe.tar.bz2
Merge branch 'hw/advice-add-nothing'
Two help messages given when "git add" notices the user gave it nothing to add have been updated to use advise() API. * hw/advice-add-nothing: add: change advice config variables used by the add API add: use advise function to display hints
Diffstat (limited to 't/t7400-submodule-basic.sh')
-rwxr-xr-xt/t7400-submodule-basic.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 42a00f9..7e8925a 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -158,7 +158,9 @@ 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.
+ hint: Turn this message off by running
+ hint: "git config advice.addIgnoredFile false"
EOF
# Does not use test_commit due to the ignore
echo "*" > .gitignore &&