advice: add enum variants for missing advice variables
In daef1b300b0 (Merge branch 'hw/advice-add-nothing', 2020-02-14), two advice settings were introduced into the `advice_config` array. Subsequently, c4a09cc9ccb (Merge branch 'hw/advise-ng', 2020-03-25) started to deprecate `advice_config` in favor of a new array, `advice_setting`. However, the latter branch did not include the former branch, and therefore `advice_setting` is missing the two entries added by the `hw/advice-add-nothing` branch. These are currently the only entries in `advice_config` missing from `advice_setting`. Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ben Boeckel committed
Aug 23, 2021 at 12:43 UTC
69290551b9a4fa22e76612926e131f926c6c9f11
2 files changed
+4
advice.c
+2
@@ -106,6 +106,8 @@ static struct {
106
int enabled;
107
} advice_setting[] = {
108
[ADVICE_ADD_EMBEDDED_REPO] = { "addEmbeddedRepo", 1 },
109
+ [ADVICE_ADD_EMPTY_PATHSPEC] = { "addEmptyPathspec", 1 },
110
+ [ADVICE_ADD_IGNORED_FILE] = { "addIgnoredFile", 1 },
111
[ADVICE_AM_WORK_DIR] = { "amWorkDir", 1 },
112
[ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME] = { "checkoutAmbiguousRemoteBranchName", 1 },
113
[ADVICE_COMMIT_BEFORE_MERGE] = { "commitBeforeMerge", 1 },
advice.h
+2
@@ -45,6 +45,8 @@ extern int advice_add_empty_pathspec;
45
*/
46
enum advice_type {
47
ADVICE_ADD_EMBEDDED_REPO,
48
+ ADVICE_ADD_EMPTY_PATHSPEC,
49
+ ADVICE_ADD_IGNORED_FILE,
50
ADVICE_AM_WORK_DIR,
51
ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME,
52
ADVICE_COMMIT_BEFORE_MERGE,