]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 808e83f) | patch
merge-ort: stop passing "opt" to read_oid_strbuf()
authorJeff King <peff@peff.net>
Thu, 14 Sep 2023 09:39:53 +0000 (05:39 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Sep 2023 19:01:29 +0000 (12:01 -0700)
commit1c9419ae9d262dab33bef22dea5c166d990b921e
treee93263669c1fc368bfaba62386afd147d671efb9tree | snapshot
parent808e83f2667e4b442a8f58f0c7ef55feb6864f65commit | diff
merge-ort: stop passing "opt" to read_oid_strbuf()

This function doesn't look at its merge_options parameter. It used to
pass it down to err(), but that function no longer exists (and didn't
look at "opt" anyway). We can drop it here.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-ort.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.