From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Feb 2020 20:54:19 +0000 (-0800)
Subject: Merge branch 'hw/advice-add-nothing'
X-Git-Tag: v2.26.0-rc0~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=daef1b300b07c3d17d47c3bf01ebde28b62ff3fe;p=thirdparty%2Fgit.git

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

daef1b300b07c3d17d47c3bf01ebde28b62ff3fe
diff --cc t/t7400-submodule-basic.sh
index 42a00f95b9,7f75bb1be6..7e8925a8ee
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@@ -156,9 -156,9 +156,11 @@@ test_expect_success 'submodule add to .
  	(
  		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 them.
 -		Use -f if you really want to add it.
++		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 &&