Skip to content

Commit da12436

Browse files
committed
Merge pull request #24 Match multi-pack-index feature from upstream
This includes commits that fixup!-revert all the midx-related commits from our GVFS branch and replaces them with the exact commits that are being merged upstream. This should automatically remove the commits during our next version rebase-and-merge action. Changes upstream: - The builtin is called 'git multi-pack-index'. - The command-line takes a 'write' verb and an '--object-dir' parameter. - We no longer have a 'midx-head' or '*.midx' files. - Instead, we have a 'multi-pack-index' file in the pack-dir. - It no longer makes sense to specify '--update-head'
2 parents 06b724f + 5f8e102 commit da12436

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

builtin/fsck.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ static int name_objects;
4949
#define ERROR_PACK 04
5050
#define ERROR_REFS 010
5151
#define ERROR_COMMIT_GRAPH 020
52+
#define ERROR_MULTI_PACK_INDEX 040
5253

5354
static const char *describe_object(struct object *obj)
5455
{
@@ -906,7 +907,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
906907
midx_argv[2] = "--object-dir";
907908
midx_argv[3] = odb->path;
908909
if (run_command(&midx_verify))
909-
errors_found |= ERROR_COMMIT_GRAPH;
910+
errors_found |= ERROR_MULTI_PACK_INDEX;
910911
}
911912
}
912913

0 commit comments

Comments
 (0)