As suggested in https://lore.kernel.org/git/87zh028ctp.fsf@xxxxxxxxxxxxxxxxxxx/ a version of this that doesn't conflict with other in-flight topics. I can submit the rest later. Ævar Arnfjörð Bjarmason (10): fsck.h: indent arguments to of fsck_set_msg_type fsck.h: use "enum object_type" instead of "int" fsck.c: rename variables in fsck_set_msg_type() for less confusion fsck.c: move definition of msg_id into append_msg_id() fsck.c: rename remaining fsck_msg_id "id" to "msg_id" fsck.h: move FSCK_{FATAL,INFO,ERROR,WARN,IGNORE} into an enum fsck.c: call parse_msg_type() early in fsck_set_msg_type() fsck.c: undefine temporary STR macro after use fsck.c: give "FOREACH_MSG_ID" a more specific name fsck.h: update FSCK_OPTIONS_* for object_name builtin/fsck.c | 5 ++-- builtin/index-pack.c | 3 +- builtin/mktag.c | 3 +- builtin/unpack-objects.c | 3 +- fsck.c | 60 ++++++++++++++++++++-------------------- fsck.h | 26 +++++++++-------- 6 files changed, 54 insertions(+), 46 deletions(-) Range-diff: -: ----------- > 1: 88b347b74ed fsck.h: indent arguments to of fsck_set_msg_type 1: 1a60d65d2ca ! 2: 868eac3d4d1 fsck.h: use use "enum object_type" instead of "int" @@ Metadata Author: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> ## Commit message ## - fsck.h: use use "enum object_type" instead of "int" + fsck.h: use "enum object_type" instead of "int" Change the fsck_walk_func to use an "enum object_type" instead of an "int" type. The types are compatible, and ever since this was added in 2: 24761f269b7 = 3: f599dc6c8f3 fsck.c: rename variables in fsck_set_msg_type() for less confusion 3: fb4c66f9305 = 4: 33f3b1942c1 fsck.c: move definition of msg_id into append_msg_id() 4: a129dbd9964 = 5: 28c9245e418 fsck.c: rename remaining fsck_msg_id "id" to "msg_id" 5: d9bee41072e = 6: d25037c6f18 fsck.h: move FSCK_{FATAL,INFO,ERROR,WARN,IGNORE} into an enum 6: 423568026c3 = 7: 66d0f1047cc fsck.c: call parse_msg_type() early in fsck_set_msg_type() 7: cb43e832738 = 8: 7643a5bf211 fsck.c: undefine temporary STR macro after use 8: 2cd14cb4e2a = 9: 7c64e2267ce fsck.c: give "FOREACH_MSG_ID" a more specific name 9: 1ada154ef23 < -: ----------- fsck.[ch]: move FOREACH_FSCK_MSG_ID & fsck_msg_id from *.c to *.h 10: c4179445f22 < -: ----------- fsck.c: pass along the fsck_msg_id in the fsck_error callback 11: c1fc724f0e8 < -: ----------- fsck.c: add an fsck_set_msg_type() API that takes enums 12: 8de91fac068 = 10: a98a3512629 fsck.h: update FSCK_OPTIONS_* for object_name 13: 29ff97856ff < -: ----------- fsck.c: move gitmodules_{found,done} into fsck_options -- 2.30.0.284.gd98b1dd5eaa7
