diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-06-13 12:50:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-13 12:50:46 -0700 |
| commit | 549ca8aa7ce73fa3d4d5daabc8929d09b92c4763 (patch) | |
| tree | 3c98a07afad31265b01da6d226fa397a3d1e71d9 /builtin | |
| parent | Merge branch 'sg/completion-zsh-workaround' (diff) | |
| parent | index-pack: correct install_packed_git() args (diff) | |
| download | tgif-549ca8aa7ce73fa3d4d5daabc8929d09b92c4763.tar.xz | |
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/index-pack.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 4ab31ed388..74fe2973e1 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1482,8 +1482,12 @@ static void final(const char *final_pack_name, const char *curr_pack_name, } 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(the_repository, p); + } if (!from_stdin) { printf("%s\n", sha1_to_hex(hash)); |