summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2021-06-10 12:14:12 -0400
committerJunio C Hamano <gitster@pobox.com>2021-06-11 12:37:33 +0900
commit382b601acde12b298bb84faa11b3f42868716a0d (patch)
tree6f1a2c4218a78e4731e94b6a6d9697f788665ad2 /ll-merge.c
parent7f53f78b04b49c2060c23df6566aceb3ba394aea (diff)
downloadgit-382b601acde12b298bb84faa11b3f42868716a0d.tar.gz
ll_union_merge(): rename path_unused parameter
The "path" parameter to ll_union_merge() is named "path_unused", since we don't ourselves use it. But we do pass it to ll_xdl_merge(), which may look at it (it gets passed to ll_binary_merge(), which may pass it to warning()). Let's rename it to correct this inaccuracy (both of the other functions correctly do not call this "unused"). Note that we also pass drv_unused, but it truly is unused by the rest of the stack (it only exists at all to provide a generic interface that matches what ll_ext_merge() needs). Reported-by: Elijah Newren <newren@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
-rw-r--r--ll-merge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ll-merge.c b/ll-merge.c
index 0ee34d8a01..261657578c 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -138,7 +138,7 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
static int ll_union_merge(const struct ll_merge_driver *drv_unused,
mmbuffer_t *result,
- const char *path_unused,
+ const char *path,
mmfile_t *orig, const char *orig_name,
mmfile_t *src1, const char *name1,
mmfile_t *src2, const char *name2,
@@ -150,7 +150,7 @@ static int ll_union_merge(const struct ll_merge_driver *drv_unused,
assert(opts);
o = *opts;
o.variant = XDL_MERGE_FAVOR_UNION;
- return ll_xdl_merge(drv_unused, result, path_unused,
+ return ll_xdl_merge(drv_unused, result, path,
orig, orig_name, src1, name1, src2, name2,
&o, marker_size);
}