diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:54:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:54:19 -0800 |
| commit | daef1b300b07c3d17d47c3bf01ebde28b62ff3fe (patch) | |
| tree | 3907573bbdd40095398e9cd159d3e971d4233a18 /t | |
| parent | d8437c57fa0752716dde2d3747e7c22bf7ce2e41 (diff) | |
| parent | 887a0fd57336dc5ff3ac28b6de0be91278e9e179 (diff) | |
| download | git-daef1b300b07c3d17d47c3bf01ebde28b62ff3fe.tar.xz | |
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')
| -rwxr-xr-x | t/t3700-add.sh | 4 | ||||
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/t/t3700-add.sh b/t/t3700-add.sh index c325167b90..88bc799807 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -326,7 +326,9 @@ test_expect_success 'git add --dry-run of an existing file output' " cat >expect.err <<\EOF The following paths are ignored by one of your .gitignore files: ignored-file -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 cat >expect.out <<\EOF add 'track-this' diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 42a00f95b9..7e8925a8ee 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 && |