diff options
| author | Heba Waly <heba.waly@gmail.com> | 2020-02-06 23:57:30 +1300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-06 11:08:00 -0800 |
| commit | 887a0fd57336dc5ff3ac28b6de0be91278e9e179 (patch) | |
| tree | 8ce142738a884521cb54279ce223f0759f8787da /builtin/add.c | |
| parent | bf66db37f1e17b71e8edb93d78ec407fbc1e0989 (diff) | |
| download | git-887a0fd57336dc5ff3ac28b6de0be91278e9e179.tar.gz | |
add: change advice config variables used by the add API
advice.addNothing config variable is used to control the visibility of
two advice messages in the add library. This config variable is
replaced by two new variables, whose names are more clear and relevant
to the two cases.
Also add the two new variables to the documentation.
Signed-off-by: Heba Waly <heba.waly@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/add.c')
| -rw-r--r-- | builtin/add.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/builtin/add.c b/builtin/add.c index 57b3186f69..0e66934f3a 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -390,8 +390,10 @@ static int add_files(struct dir_struct *dir, int flags) fprintf(stderr, _(ignore_error)); for (i = 0; i < dir->ignored_nr; i++) fprintf(stderr, "%s\n", dir->ignored[i]->name); - if (advice_add_nothing) - advise(_("Use -f if you really want to add them.\n")); + if (advice_add_ignored_file) + advise(_("Use -f if you really want to add them.\n" + "Turn this message off by running\n" + "\"git config advice.addIgnoredFile false\"")); exit_status = 1; } @@ -481,8 +483,10 @@ int cmd_add(int argc, const char **argv, const char *prefix) if (require_pathspec && pathspec.nr == 0) { fprintf(stderr, _("Nothing specified, nothing added.\n")); - if (advice_add_nothing) - advise( _("Maybe you wanted to say 'git add .'?\n")); + if (advice_add_empty_pathspec) + advise( _("Maybe you wanted to say 'git add .'?\n" + "Turn this message off by running\n" + "\"git config advice.addEmptyPathspec false\"")); return 0; } |