]> git.ipfire.org Git - thirdparty/git.git/commitdiff
fsck: use ERROR_MULTI_PACK_INDEX
authorDerrick Stolee <dstolee@microsoft.com>
Tue, 19 May 2020 19:48:45 +0000 (19:48 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 May 2020 23:13:22 +0000 (16:13 -0700)
The multi-pack-index was added to the data verified by git-fsck in
ea5ae6c3 "fsck: verify multi-pack-index". This implementation was
based on the implementation for verifying the commit-graph, and a
copy-paste error kept the ERROR_COMMIT_GRAPH flag as the bit set
when an error appears in the multi-pack-index.

Add a new flag, ERROR_MULTI_PACK_INDEX, and use that instead.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/fsck.c

index 06eb42172099a39e6f181d0dd7eab581595d9756..b1447c261020a957fd048a2ed4b9e6b1656721e3 100644 (file)
@@ -49,6 +49,7 @@ static int name_objects;
 #define ERROR_PACK 04
 #define ERROR_REFS 010
 #define ERROR_COMMIT_GRAPH 020
+#define ERROR_MULTI_PACK_INDEX 040
 
 static const char *describe_object(struct object *obj)
 {
@@ -862,7 +863,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
                        midx_argv[2] = "--object-dir";
                        midx_argv[3] = alt->path;
                        if (run_command(&midx_verify))
-                               errors_found |= ERROR_COMMIT_GRAPH;
+                               errors_found |= ERROR_MULTI_PACK_INDEX;
                }
        }