]> git.ipfire.org Git - thirdparty/git.git/commitdiff
builtin/index-pack.c: move `.idx` files into place last
authorTaylor Blau <me@ttaylorr.com>
Thu, 9 Sep 2021 23:24:53 +0000 (19:24 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2021 01:23:11 +0000 (18:23 -0700)
In a similar spirit as preceding patches to `git repack` and `git
pack-objects`, fix the identical problem in `git index-pack`.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/index-pack.c

index cb0ec3d504e59f6ebb9c82a4b1b75736f7608c83..c889f5f96481910f6f20ad35ffb7a476d854f692 100644 (file)
@@ -1527,11 +1527,11 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
 
        rename_tmp_packfile(&final_pack_name, curr_pack_name, &pack_name,
                            hash, "pack", from_stdin);
-       rename_tmp_packfile(&final_index_name, curr_index_name, &index_name,
-                           hash, "idx", 1);
        if (curr_rev_index_name)
                rename_tmp_packfile(&final_rev_index_name, curr_rev_index_name,
                                    &rev_index_name, hash, "rev", 1);
+       rename_tmp_packfile(&final_index_name, curr_index_name, &index_name,
+                           hash, "idx", 1);
 
        if (do_fsck_object) {
                struct packed_git *p;