summaryrefslogtreecommitdiff
path: root/advice.c
diff options
context:
space:
mode:
authorHeba Waly <heba.waly@gmail.com>2020-02-06 10:57:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-06 19:08:00 (GMT)
commit887a0fd57336dc5ff3ac28b6de0be91278e9e179 (patch)
tree8ce142738a884521cb54279ce223f0759f8787da /advice.c
parentbf66db37f1e17b71e8edb93d78ec407fbc1e0989 (diff)
downloadgit-887a0fd57336dc5ff3ac28b6de0be91278e9e179.zip
git-887a0fd57336dc5ff3ac28b6de0be91278e9e179.tar.gz
git-887a0fd57336dc5ff3ac28b6de0be91278e9e179.tar.bz2
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 'advice.c')
-rw-r--r--advice.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/advice.c b/advice.c
index 098ac0a..97f3f98 100644
--- 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 }