]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/index-pack-maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Jun 2018 19:50:46 +0000 (12:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Jun 2018 19:50:46 +0000 (12:50 -0700)
"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.

* jk/index-pack-maint:
  index-pack: correct install_packed_git() args
  index-pack: handle --strict checks of non-repo packs
  prepare_commit_graft: treat non-repository as a noop

1  2 
builtin/index-pack.c
commit.c
t/t5300-pack-object.sh
t/t7415-submodule-names.sh

index 4ab31ed388bb860110f5bd33ddf6d707f0cfa41f,3030c88d384742c86677316c517f529a8ff3bd72..74fe2973e1256e092652fce28ba2036cc3203af9
@@@ -1482,8 -1480,12 +1482,12 @@@ static void final(const char *final_pac
        } else
                chmod(final_index_name, 0444);
  
-       if (do_fsck_object)
-               add_packed_git(final_index_name, strlen(final_index_name), 0);
+       if (do_fsck_object) {
+               struct packed_git *p;
+               p = add_packed_git(final_index_name, strlen(final_index_name), 0);
+               if (p)
 -                      install_packed_git(p);
++                      install_packed_git(the_repository, p);
+       }
  
        if (!from_stdin) {
                printf("%s\n", sha1_to_hex(hash));
diff --cc commit.c
Simple merge
Simple merge
Simple merge