Merge branch 'jk/index-pack-correct-depth-fix' into maint

* jk/index-pack-correct-depth-fix:
index-pack: always zero-initialize object_entry list

diff --combined builtin/index-pack.c
index ef62124aa491a9ac1e430d5baa3cf448902ac9c4,6922086376839e85ce43a5334ba67e18bb6f4c04..3a3051d53e03cfb51d7eb156356f158e11f64b10
--- 1/builtin/index-pack.c
--- 2/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@@ -291,7 -291,7 +291,7 @@@ static void parse_pack_header(void
        if (hdr->hdr_signature != htonl(PACK_SIGNATURE))
                die(_("pack signature mismatch"));
        if (!pack_version_ok(hdr->hdr_version))
 -              die("pack version %"PRIu32" unsupported",
 +              die(_("pack version %"PRIu32" unsupported"),
                        ntohl(hdr->hdr_version));
  
        nr_objects = ntohl(hdr->hdr_entries);
@@@ -1061,8 -1061,7 +1061,8 @@@ static void resolve_deltas(void
                        int ret = pthread_create(&thread_data[i].thread, NULL,
                                                 threaded_second_pass, thread_data + i);
                        if (ret)
 -                              die("unable to create thread: %s", strerror(ret));
 +                              die(_("unable to create thread: %s"),
 +                                  strerror(ret));
                }
                for (i = 0; i < nr_threads; i++)
                        pthread_join(thread_data[i].thread, NULL);
@@@ -1099,7 -1098,7 +1099,7 @@@ static void conclude_pack(int fix_thin_
        if (fix_thin_pack) {
                struct sha1file *f;
                unsigned char read_sha1[20], tail_sha1[20];
 -              char msg[48];
 +              struct strbuf msg = STRBUF_INIT;
                int nr_unresolved = nr_deltas - nr_resolved_deltas;
                int nr_objects_initial = nr_objects;
                if (nr_unresolved <= 0)
@@@ -1107,20 -1106,21 +1107,22 @@@
                objects = xrealloc(objects,
                                   (nr_objects + nr_unresolved + 1)
                                   * sizeof(*objects));
+               memset(objects + nr_objects + 1, 0,
+                      nr_unresolved * sizeof(*objects));
                f = sha1fd(output_fd, curr_pack);
                fix_unresolved_deltas(f, nr_unresolved);
 -              sprintf(msg, "completed with %d local objects",
 -                      nr_objects - nr_objects_initial);
 -              stop_progress_msg(&progress, msg);
 +              strbuf_addf(&msg, _("completed with %d local objects"),
 +                          nr_objects - nr_objects_initial);
 +              stop_progress_msg(&progress, msg.buf);
 +              strbuf_release(&msg);
                sha1close(f, tail_sha1, 0);
                hashcpy(read_sha1, pack_sha1);
                fixup_pack_header_footer(output_fd, pack_sha1,
                                         curr_pack, nr_objects,
                                         read_sha1, consumed_bytes-20);
                if (hashcmp(read_sha1, tail_sha1) != 0)
 -                      die("Unexpected tail checksum for %s "
 -                          "(disk corruption?)", curr_pack);
 +                      die(_("Unexpected tail checksum for %s "
 +                            "(disk corruption?)"), curr_pack);
        }
        if (nr_deltas != nr_resolved_deltas)
                die(Q_("pack has %d unresolved delta",
@@@ -1329,17 -1329,17 +1331,17 @@@ static int git_index_pack_config(const 
        if (!strcmp(k, "pack.indexversion")) {
                opts->version = git_config_int(k, v);
                if (opts->version > 2)
 -                      die("bad pack.indexversion=%"PRIu32, opts->version);
 +                      die(_("bad pack.indexversion=%"PRIu32), opts->version);
                return 0;
        }
        if (!strcmp(k, "pack.threads")) {
                nr_threads = git_config_int(k, v);
                if (nr_threads < 0)
 -                      die("invalid number of threads specified (%d)",
 +                      die(_("invalid number of threads specified (%d)"),
                            nr_threads);
  #ifdef NO_PTHREADS
                if (nr_threads != 1)
 -                      warning("no threads support, ignoring %s", k);
 +                      warning(_("no threads support, ignoring %s"), k);
                nr_threads = 1;
  #endif
                return 0;
@@@ -1512,8 -1512,8 +1514,8 @@@ int cmd_index_pack(int argc, const cha
                                        usage(index_pack_usage);
  #ifdef NO_PTHREADS
                                if (nr_threads != 1)
 -                                      warning("no threads support, "
 -                                              "ignoring %s", arg);
 +                                      warning(_("no threads support, "
 +                                                "ignoring %s"), arg);
                                nr_threads = 1;
  #endif
                        } else if (!prefixcmp(arg, "--pack_header=")) {