From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 Sep 2023 00:01:36 +0000 (-0700)
Subject: Merge branch 'jk/ort-unused-parameter-cleanups'
X-Git-Tag: v2.43.0-rc0~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb6e6e06d5b7de6aacae6268712f3733d51cb38e;p=thirdparty%2Fgit.git

Merge branch 'jk/ort-unused-parameter-cleanups'

Code clean-up.

* jk/ort-unused-parameter-cleanups:
  merge-ort: lowercase a few error messages
  merge-ort: drop unused "opt" parameter from merge_check_renames_reusable()
  merge-ort: drop unused parameters from detect_and_process_renames()
  merge-ort: stop passing "opt" to read_oid_strbuf()
  merge-ort: drop custom err() function
---

fb6e6e06d5b7de6aacae6268712f3733d51cb38e