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>

diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index 4be93f8..bdd37c3 100644 (file)
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@ -110,4 +110,10 @@ advice.*::
        submoduleAlternateErrorStrategyDie::
                Advice shown when a submodule.alternateErrorStrategy option
                configured to "die" causes a fatal error.
+       addIgnoredFile::
+               Advice shown if a user attempts to add an ignored file to
+               the index.
+       addEmptyPathspec::
+               Advice shown if a user runs the add command without providing
+               the pathspec parameter.
 --

diff --git a/advice.c b/advice.c
index 098ac0a..97f3f98 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -31,7 +31,8 @@ int advice_graft_file_deprecated = 1;
 int advice_checkout_ambiguous_remote_branch_name = 1;
 int advice_nested_tag = 1;
 int advice_submodule_alternate_error_strategy_die = 1;
-int advice_add_nothing = 1;
+int advice_add_ignored_file = 1;
+int advice_add_empty_pathspec = 1;
 
 static int advice_use_color = -1;
 static char advice_colors[][COLOR_MAXLEN] = {
@@ -92,7 +93,8 @@ static struct {
        { "checkoutAmbiguousRemoteBranchName", &advice_checkout_ambiguous_remote_branch_name },
        { "nestedTag", &advice_nested_tag },
        { "submoduleAlternateErrorStrategyDie", &advice_submodule_alternate_error_strategy_die },
-       { "addNothing", &advice_add_nothing },
+       { "addIgnoredFile", &advice_add_ignored_file },
+       { "addEmptyPathspec", &advice_add_empty_pathspec },
 
        /* make this an alias for backward compatibility */
        { "pushNonFastForward", &advice_push_update_rejected }

diff --git a/advice.h b/advice.h
index 83287b0..0e6e58d 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -31,7 +31,8 @@ extern int advice_graft_file_deprecated;
 extern int advice_checkout_ambiguous_remote_branch_name;
 extern int advice_nested_tag;
 extern int advice_submodule_alternate_error_strategy_die;
-extern int advice_add_nothing;
+extern int advice_add_ignored_file;
+extern int advice_add_empty_pathspec;
 
 int git_default_advice_config(const char *var, const char *value);
 __attribute__((format (printf, 1, 2)))

diff --git a/builtin/add.c b/builtin/add.c
index 57b3186..0e66934 100644 (file)
--- 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;
        }
 

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index a649805..88bc799 100755 (executable)
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -327,6 +327,8 @@ cat >expect.err <<\EOF
 The following paths are ignored by one of your .gitignore files:
 ignored-file
 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'