diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-12-13 12:25:15 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-12-13 12:25:15 (GMT) |
commit | 96738bb0e1e4bff68cf39ed288330d76afdbc425 (patch) | |
tree | f4c4360bb8632cecfa3afb786dfad301a487b0a0 /fsck.h | |
parent | c48035d29b4e524aed3a32f0403676f0d9128863 (diff) | |
parent | 37ed7bf0f13d204ccb6b8e7e2fbcf7b3bf13e25c (diff) | |
download | git-96738bb0e1e4bff68cf39ed288330d76afdbc425.zip git-96738bb0e1e4bff68cf39ed288330d76afdbc425.tar.gz git-96738bb0e1e4bff68cf39ed288330d76afdbc425.tar.bz2 |
Sync with 2.38.3
Diffstat (limited to 'fsck.h')
-rw-r--r-- | fsck.h | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -59,6 +59,10 @@ enum fsck_msg_type { FUNC(GITMODULES_URL, ERROR) \ FUNC(GITMODULES_PATH, ERROR) \ FUNC(GITMODULES_UPDATE, ERROR) \ + FUNC(GITATTRIBUTES_MISSING, ERROR) \ + FUNC(GITATTRIBUTES_LARGE, ERROR) \ + FUNC(GITATTRIBUTES_LINE_LENGTH, ERROR) \ + FUNC(GITATTRIBUTES_BLOB, ERROR) \ /* warnings */ \ FUNC(EMPTY_NAME, WARN) \ FUNC(FULL_PATHNAME, WARN) \ @@ -133,6 +137,8 @@ struct fsck_options { struct oidset skiplist; struct oidset gitmodules_found; struct oidset gitmodules_done; + struct oidset gitattributes_found; + struct oidset gitattributes_done; kh_oid_map_t *object_names; }; @@ -140,18 +146,24 @@ struct fsck_options { .skiplist = OIDSET_INIT, \ .gitmodules_found = OIDSET_INIT, \ .gitmodules_done = OIDSET_INIT, \ + .gitattributes_found = OIDSET_INIT, \ + .gitattributes_done = OIDSET_INIT, \ .error_func = fsck_error_function \ } #define FSCK_OPTIONS_STRICT { \ .strict = 1, \ .gitmodules_found = OIDSET_INIT, \ .gitmodules_done = OIDSET_INIT, \ + .gitattributes_found = OIDSET_INIT, \ + .gitattributes_done = OIDSET_INIT, \ .error_func = fsck_error_function, \ } #define FSCK_OPTIONS_MISSING_GITMODULES { \ .strict = 1, \ .gitmodules_found = OIDSET_INIT, \ .gitmodules_done = OIDSET_INIT, \ + .gitattributes_found = OIDSET_INIT, \ + .gitattributes_done = OIDSET_INIT, \ .error_func = fsck_error_cb_print_missing_gitmodules, \ } |