From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [PATCH 4/4] merge-ort: drop unused "opt" parameter from merge_check_renames_reusable()
Date: Thu, 14 Sep 2023 05:40:04 -0400 [thread overview]
Message-ID: <20230914094004.GD2254894@coredump.intra.peff.net> (raw)
In-Reply-To: <20230914093409.GA2254811@coredump.intra.peff.net>
The merge_options parameter has never been used since the function was
introduced in 64aceb6d73 (merge-ort: add code to check for whether
cached renames can be reused, 2021-05-20). In theory some merge options
might impact our decisions here, but that has never been the case so
far.
Let's drop it to appease -Wunused-parameter; it would be easy to add
back later if we need to (there is only one caller).
Signed-off-by: Jeff King <peff@peff.net>
---
merge-ort.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/merge-ort.c b/merge-ort.c
index 20eefd9b5e..3953c9f745 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -4880,8 +4880,7 @@ static void merge_start(struct merge_options *opt, struct merge_result *result)
trace2_region_leave("merge", "allocate/init", opt->repo);
}
-static void merge_check_renames_reusable(struct merge_options *opt,
- struct merge_result *result,
+static void merge_check_renames_reusable(struct merge_result *result,
struct tree *merge_base,
struct tree *side1,
struct tree *side2)
@@ -5083,7 +5082,7 @@ void merge_incore_nonrecursive(struct merge_options *opt,
trace2_region_enter("merge", "merge_start", opt->repo);
assert(opt->ancestor != NULL);
- merge_check_renames_reusable(opt, result, merge_base, side1, side2);
+ merge_check_renames_reusable(result, merge_base, side1, side2);
merge_start(opt, result);
/*
* Record the trees used in this merge, so if there's a next merge in
--
2.42.0.628.g8a27295885
next prev parent reply other threads:[~2023-09-14 9:44 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-14 9:34 [PATCH 0/4] merge-ort unused parameter cleanups Jeff King
2023-09-14 9:39 ` [PATCH 1/4] merge-ort: drop custom err() function Jeff King
2023-09-16 2:54 ` Elijah Newren
2023-09-16 5:50 ` Jeff King
2023-09-14 9:39 ` [PATCH 2/4] merge-ort: stop passing "opt" to read_oid_strbuf() Jeff King
2023-09-14 9:39 ` [PATCH 3/4] merge-ort: drop unused parameters from detect_and_process_renames() Jeff King
2023-09-16 3:04 ` Elijah Newren
2023-09-14 9:40 ` Jeff King [this message]
2023-09-16 3:09 ` [PATCH 4/4] merge-ort: drop unused "opt" parameter from merge_check_renames_reusable() Elijah Newren
2023-09-16 5:52 ` Jeff King
2023-09-16 2:56 ` [PATCH 0/4] merge-ort unused parameter cleanups Elijah Newren
2023-09-16 6:00 ` [PATCH 5/4] merge-ort: lowercase a few error messages Jeff King
2023-09-16 7:29 ` Jeff King
2023-09-16 21:49 ` Junio C Hamano
2023-09-16 22:11 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230914094004.GD2254894@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).