Merge branch 'ds/multi-pack-verify'

gitster · gitster · commit d55a4ae71d51 · 2020-05-24T19:39:39.000-07:00
Fix for a copy-and-paste error introduced during 2.20 era.

* ds/multi-pack-verify:
  fsck: use ERROR_MULTI_PACK_INDEX
diff --git a/builtin/fsck.c b/builtin/fsck.c
@@ -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(const struct object_id *oid)
 {
@@ -952,7 +953,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 			midx_argv[2] = "--object-dir";
 			midx_argv[3] = odb->path;
 			if (run_command(&midx_verify))
-				errors_found |= ERROR_COMMIT_GRAPH;
+				errors_found |= ERROR_MULTI_PACK_INDEX;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ static int name_objects;`
`49`	`49`	`#define ERROR_PACK 04`
`50`	`50`	`#define ERROR_REFS 010`
`51`	`51`	`#define ERROR_COMMIT_GRAPH 020`
	`52`	`+#define ERROR_MULTI_PACK_INDEX 040`
`52`	`53`
`53`	`54`	`static const char describe_object(const struct object_id oid)`
`54`	`55`	`{`
`@@ -952,7 +953,7 @@ int cmd_fsck(int argc, const char *argv, const char prefix)`
`952`	`953`	`midx_argv[2] = "--object-dir";`
`953`	`954`	`midx_argv[3] = odb->path;`
`954`	`955`	`if (run_command(&midx_verify))`
`955`		`- errors_found \|= ERROR_COMMIT_GRAPH;`
	`956`	`+ errors_found \|= ERROR_MULTI_PACK_INDEX;`
`956`	`957`	`}`
`957`	`958`	`}`
`958`	`959`