diff options
author | 2020-02-14 12:54:19 -0800 | |
---|---|---|
committer | 2020-02-14 12:54:19 -0800 | |
commit | daef1b300b07c3d17d47c3bf01ebde28b62ff3fe (patch) | |
tree | 3907573bbdd40095398e9cd159d3e971d4233a18 /t/t3700-add.sh | |
parent | The fourth batch for 2.26 (diff) | |
parent | add: change advice config variables used by the add API (diff) | |
download | tgif-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/t3700-add.sh')
-rwxr-xr-x | t/t3700-add.sh | 4 |
1 files changed, 3 insertions, 1 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' |