summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2021-08-23 10:44:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-08-25 19:07:52 (GMT)
commitc2a4b6d4ee4f7f52521c1c36d63744f1a3c08d50 (patch)
tree2bb6a306b5340c88fc0909a2fba31f8c044a425e
parented9bff0817d5a7500b50a39c1c35b44aa3e72578 (diff)
downloadgit-c2a4b6d4ee4f7f52521c1c36d63744f1a3c08d50.zip
git-c2a4b6d4ee4f7f52521c1c36d63744f1a3c08d50.tar.gz
git-c2a4b6d4ee4f7f52521c1c36d63744f1a3c08d50.tar.bz2
advice: remove use of global advice_add_embedded_repo
The external use of this variable was added in 532139940c9 (add: warn when adding an embedded repository, 2017-06-14). For the use-case it's more straightforward to track whether we've shown advice in check_embedded_repo() than setting the global variable. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--advice.c2
-rw-r--r--advice.h1
-rw-r--r--builtin/add.c7
3 files changed, 4 insertions, 6 deletions
diff --git a/advice.c b/advice.c
index b18833b..41cfea8 100644
--- a/advice.c
+++ b/advice.c
@@ -4,7 +4,6 @@
#include "help.h"
#include "string-list.h"
-int advice_add_embedded_repo = 1;
int advice_graft_file_deprecated = 1;
static int advice_use_color = -1;
@@ -38,7 +37,6 @@ static struct {
const char *name;
int *preference;
} advice_config[] = {
- { "addEmbeddedRepo", &advice_add_embedded_repo },
{ "graftFileDeprecated", &advice_graft_file_deprecated },
};
diff --git a/advice.h b/advice.h
index ed51db0..4b754f4 100644
--- a/advice.h
+++ b/advice.h
@@ -5,7 +5,6 @@
struct string_list;
-extern int advice_add_embedded_repo;
extern int advice_graft_file_deprecated;
/*
diff --git a/builtin/add.c b/builtin/add.c
index cf29b30..8a5dd29 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -419,6 +419,7 @@ static const char embedded_advice[] = N_(
static void check_embedded_repo(const char *path)
{
struct strbuf name = STRBUF_INIT;
+ static int adviced_on_embedded_repo = 0;
if (!warn_on_embedded_repo)
return;
@@ -430,10 +431,10 @@ static void check_embedded_repo(const char *path)
strbuf_strip_suffix(&name, "/");
warning(_("adding embedded git repository: %s"), name.buf);
- if (advice_add_embedded_repo) {
+ if (!adviced_on_embedded_repo &&
+ advice_enabled(ADVICE_ADD_EMBEDDED_REPO)) {
advise(embedded_advice, name.buf, name.buf);
- /* there may be multiple entries; advise only once */
- advice_add_embedded_repo = 0;
+ adviced_on_embedded_repo = 1;
}
strbuf_release(&name);