kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

midx.c: lookup MIDX by object directory during repack 

Apply similar treatment as in the last commit to the MIDX `repack`
operation.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Taylor Blau 2021-10-08 17:46:35 -04:00 committed by Junio C Hamano
parent 98926e0d01
commit c0f1f9dec4
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
midx.c
View File

@ -1861,7 +1861,7 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size,
struct child_process cmd = CHILD_PROCESS_INIT; struct child_process cmd = CHILD_PROCESS_INIT;
FILE *cmd_in; FILE *cmd_in;
struct strbuf base_name = STRBUF_INIT; struct strbuf base_name = STRBUF_INIT;
struct multi_pack_index *m = load_multi_pack_index(object_dir, 1); struct multi_pack_index *m = lookup_multi_pack_index(r, object_dir);


/* /*
* When updating the default for these configuration * When updating the default for these configuration
@ -1933,11 +1933,8 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size,
} }


result = write_midx_internal(object_dir, NULL, NULL, NULL, NULL, flags); result = write_midx_internal(object_dir, NULL, NULL, NULL, NULL, flags);
m = NULL;


cleanup: cleanup:
if (m)
close_midx(m);
free(include_pack); free(include_pack);
return result; return result;
} }