summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorBen Boeckel <mathstuf@gmail.com>2021-08-23 10:43:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-08-25 19:07:51 (GMT)
commit69290551b9a4fa22e76612926e131f926c6c9f11 (patch)
treedcb8d22c05084b8520fbf1c5254678d9e7984e3d /advice.h
parent225bc32a989d7a22fa6addafd4ce7dcd04675dbf (diff)
downloadgit-69290551b9a4fa22e76612926e131f926c6c9f11.zip
git-69290551b9a4fa22e76612926e131f926c6c9f11.tar.gz
git-69290551b9a4fa22e76612926e131f926c6c9f11.tar.bz2
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>
Diffstat (limited to 'advice.h')
-rw-r--r--advice.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/advice.h b/advice.h
index 9f8ffc7..68629b5 100644
--- a/advice.h
+++ b/advice.h
@@ -45,6 +45,8 @@ extern int advice_add_empty_pathspec;
*/
enum advice_type {
ADVICE_ADD_EMBEDDED_REPO,
+ ADVICE_ADD_EMPTY_PATHSPEC,
+ ADVICE_ADD_IGNORED_FILE,
ADVICE_AM_WORK_DIR,
ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME,
ADVICE_COMMIT_BEFORE_MERGE,