| commit | 382b601acde12b298bb84faa11b3f42868716a0d | |
| author | Jeff King <peff@peff.net> | |
| Thu, 10 Jun 2021 16:14:12 +0000 (10 12:14 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 11 Jun 2021 03:37:33 +0000 (11 12:37 +0900) | ||
| tree | 6f1a2c4218a78e4731e94b6a6d9697f788665ad2 | treesnapshot (tar.gz zip) |
| parent | 7f53f78b04b49c2060c23df6566aceb3ba394aea | commitdiff |
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>
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>
| ll-merge.c | diffblobblamehistory |