From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Jun 2018 19:50:46 +0000 (-0700)
Subject: Merge branch 'jk/index-pack-maint'
X-Git-Tag: v2.18.0-rc2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=549ca8aa7ce73fa3d4d5daabc8929d09b92c4763;p=git

Merge branch 'jk/index-pack-maint'

"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
---

549ca8aa7ce73fa3d4d5daabc8929d09b92c4763
diff --cc builtin/index-pack.c
index 4ab31ed388,3030c88d38..74fe2973e1
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@@ -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));