diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-03-17 00:53:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-17 00:53:09 (GMT) |
| commit | 38bbb9e990e7290c286ad0a8ea250ab53470a374 (patch) | |
| tree | 9643b7ecc0a51c01ade32df122f5d7e1d70d3aff /commit-graph.c | |
| parent | 7431379a9c5ed4006603114b1991c6c6e98d5dca (diff) | |
| parent | 99d60545f87445d7050999b826fc4cd49e69376c (diff) | |
| download | git-38bbb9e990e7290c286ad0a8ea250ab53470a374.zip git-38bbb9e990e7290c286ad0a8ea250ab53470a374.tar.gz git-38bbb9e990e7290c286ad0a8ea250ab53470a374.tar.bz2 | |
Merge branch 'ab/string-list-count-in-size-t'
Count string_list items in size_t, not "unsigned int".
* ab/string-list-count-in-size-t:
string-list API: change "nr" and "alloc" to "size_t"
gettext API users: don't explicitly cast ngettext()'s "n"
Diffstat (limited to 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/commit-graph.c b/commit-graph.c index a99d992..adffd02 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1698,10 +1698,10 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx, dirlen = packname.len; if (ctx->report_progress) { strbuf_addf(&progress_title, - Q_("Finding commits for commit graph in %d pack", - "Finding commits for commit graph in %d packs", + Q_("Finding commits for commit graph in %"PRIuMAX" pack", + "Finding commits for commit graph in %"PRIuMAX" packs", pack_indexes->nr), - pack_indexes->nr); + (uintmax_t)pack_indexes->nr); ctx->progress = start_delayed_progress(progress_title.buf, 0); ctx->progress_done = 0; } |