Jeff King <[email protected]> writes:
> On Mon, Jun 04, 2018 at 10:57:30PM +0900, Junio C Hamano wrote:
>
>> * jk/index-pack-maint (2018-06-01) 2 commits
>> (merged to 'next' on 2018-06-04 at c553a485e8)
>> + index-pack: handle --strict checks of non-repo packs
>> + prepare_commit_graft: treat non-repository as a noop
>>
>> "index-pack --strict" has been taught to make sure that it runs the
>> final object integrity checks after making the freshly indexed
>> packfile available to itself.
>>
>> Will cook in 'next'.
>
> This second patch fixes a regression in v2.18.0-rc1 and in v2.17.1. I
> don't know if we'd want to consider it for v2.18 or not (it should be
> able to be applied independently from the first).
I gave the topic -maint suffix, but I'd need a little fix-up patch
on top to actually make it mergeable to the maintenance track. With
that, let's merge it to 'master' before v2.18 final happens and then
also to 'maint'.
builtin/index-pack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 7b399478dd..3030c88d38 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1484,7 +1484,7 @@ static void final(const char *final_pack_name, const char
*curr_pack_name,
struct packed_git *p;
p = add_packed_git(final_index_name, strlen(final_index_name),
0);
if (p)
- install_packed_git(the_repository, p);
+ install_packed_git(p);
}
if (!from_stdin) {
