Skip to content

Commit f3adf1e

Browse files
dschoderrickstolee
authored andcommitted
Merge pull request git-for-windows#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 7bb56c4 + 169bfeb commit f3adf1e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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(const struct object_id *oid)
5455
{
@@ -952,7 +953,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
952953
midx_argv[2] = "--object-dir";
953954
midx_argv[3] = odb->path;
954955
if (run_command(&midx_verify))
955-
errors_found |= ERROR_COMMIT_GRAPH;
956+
errors_found |= ERROR_MULTI_PACK_INDEX;
956957
}
957958
}
958959

0 commit comments

Comments
 (0)