Skip to content

Commit 1028db0

Browse files
rjustogitster
authored andcommitted
add: use advise_if_enabled for ADVICE_ADD_EMPTY_PATHSPEC
Since 93b0d86 (git-add: error out when given no arguments., 2006-12-20) we display a message when no arguments are given to "git add". Part of that message was converted to advice in bf66db3 (add: use advise function to display hints, 2020-01-07). Following the same line of reasoning as in the previous commit, it is sensible to use advise_if_enabled() here. Therefore, use advise_if_enabled() in builtin/add.c to show the ADVICE_ADD_EMPTY_PATHSPEC advice, and don't bother checking there the visibility of the advice or displaying the instruction on how to disable it. Also add a test for these messages, in order to detect a possible change in them. Signed-off-by: Rubén Justo <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9da49be commit 1028db0

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

builtin/add.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -438,10 +438,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)
438438

439439
if (require_pathspec && pathspec.nr == 0) {
440440
fprintf(stderr, _("Nothing specified, nothing added.\n"));
441-
if (advice_enabled(ADVICE_ADD_EMPTY_PATHSPEC))
442-
advise( _("Maybe you wanted to say 'git add .'?\n"
443-
"Turn this message off by running\n"
444-
"\"git config advice.addEmptyPathspec false\""));
441+
advise_if_enabled(ADVICE_ADD_EMPTY_PATHSPEC,
442+
_("Maybe you wanted to say 'git add .'?"));
445443
return 0;
446444
}
447445

t/t3700-add.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@ test_expect_success 'Test of git add' '
2828
touch foo && git add foo
2929
'
3030

31+
test_expect_success 'Test with no pathspecs' '
32+
cat >expect <<-EOF &&
33+
Nothing specified, nothing added.
34+
hint: Maybe you wanted to say ${SQ}git add .${SQ}?
35+
hint: Disable this message with "git config advice.addEmptyPathspec false"
36+
EOF
37+
git add 2>actual &&
38+
test_cmp expect actual
39+
'
40+
3141
test_expect_success 'Post-check that foo is in the index' '
3242
git ls-files foo | grep foo
3343
'

0 commit comments

Comments
 (0)