Skip to content

Commit 6929055

Browse files
mathstufgitster
authored andcommitted
advice: add enum variants for missing advice variables
In daef1b3 (Merge branch 'hw/advice-add-nothing', 2020-02-14), two advice settings were introduced into the `advice_config` array. Subsequently, c4a09cc (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 <[email protected]> Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 225bc32 commit 6929055

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

advice.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ static struct {
106106
int enabled;
107107
} advice_setting[] = {
108108
[ADVICE_ADD_EMBEDDED_REPO] = { "addEmbeddedRepo", 1 },
109+
[ADVICE_ADD_EMPTY_PATHSPEC] = { "addEmptyPathspec", 1 },
110+
[ADVICE_ADD_IGNORED_FILE] = { "addIgnoredFile", 1 },
109111
[ADVICE_AM_WORK_DIR] = { "amWorkDir", 1 },
110112
[ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME] = { "checkoutAmbiguousRemoteBranchName", 1 },
111113
[ADVICE_COMMIT_BEFORE_MERGE] = { "commitBeforeMerge", 1 },

advice.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ extern int advice_add_empty_pathspec;
4545
*/
4646
enum advice_type {
4747
ADVICE_ADD_EMBEDDED_REPO,
48+
ADVICE_ADD_EMPTY_PATHSPEC,
49+
ADVICE_ADD_IGNORED_FILE,
4850
ADVICE_AM_WORK_DIR,
4951
ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME,
5052
ADVICE_COMMIT_BEFORE_MERGE,

0 commit comments

Comments
 (0)