]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/string-list-count-in-size-t'
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Mar 2022 00:53:09 +0000 (17:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Mar 2022 00:53:09 +0000 (17:53 -0700)
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"

1  2 
builtin/index-pack.c
builtin/receive-pack.c
commit-graph.c
merge-ort.c
wt-status.c

Simple merge
Simple merge
diff --cc commit-graph.c
Simple merge
diff --cc merge-ort.c
Simple merge
diff --cc wt-status.c
Simple merge