]> git.ipfire.org Git - thirdparty/git.git/blobdiff - fsck.h
Merge branch 'maint-2.36' into maint-2.37
[thirdparty/git.git] / fsck.h
diff --git a/fsck.h b/fsck.h
index 6f801e53b1d70ea9e522babbb119b913a7b32b62..121b8319852da6824a8d905c22911ca1c65436d5 100644 (file)
--- a/fsck.h
+++ b/fsck.h
@@ -55,6 +55,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) \
@@ -129,6 +133,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;
 };
 
@@ -136,18 +142,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, \
 }