* [PATCH] fsck: use ERROR_MULTI_PACK_INDEX
@ 2020-05-19 19:48 Derrick Stolee via GitGitGadget
2020-05-19 23:12 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Derrick Stolee via GitGitGadget @ 2020-05-19 19:48 UTC (permalink / raw)
To: git; +Cc: Derrick Stolee, Derrick Stolee
From: Derrick Stolee <dstolee@microsoft.com>
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>
---
fsck: use ERROR_MULTI_PACK_INDEX
Here is a clean-up that I forgot to send a while back.
Thanks, -Stolee
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-637%2Fderrickstolee%2Ffsck-midx-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-637/derrickstolee/fsck-midx-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/637
builtin/fsck.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 8d13794b141..f02cbdb439b 100644
--- 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;
}
}
base-commit: efcab5b7a3d2ce2ae4bf808b335938098b18d960
--
gitgitgadget
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] fsck: use ERROR_MULTI_PACK_INDEX
2020-05-19 19:48 [PATCH] fsck: use ERROR_MULTI_PACK_INDEX Derrick Stolee via GitGitGadget
@ 2020-05-19 23:12 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2020-05-19 23:12 UTC (permalink / raw)
To: Derrick Stolee via GitGitGadget; +Cc: git, Derrick Stolee
"Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Derrick Stolee <dstolee@microsoft.com>
>
> The multi-pack-index was added to the data verified by git-fsck in
> ea5ae6c3 "fsck: verify multi-pack-index".
That's 66ec0390 (fsck: verify multi-pack-index, 2018-09-13) that
first appeared in v2.20
> 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.
Thanks. Will queue.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-19 23:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-19 19:48 [PATCH] fsck: use ERROR_MULTI_PACK_INDEX Derrick Stolee via GitGitGadget
2020-05-19 23:12 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).