]> git.ipfire.org Git - thirdparty/git.git/commit
diff: clean up external-diff argv setup
authorJeff King <peff@peff.net>
Fri, 6 Jan 2023 11:04:18 +0000 (06:04 -0500)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jan 2023 12:50:07 +0000 (21:50 +0900)
commitde8f14e1c01451e751da80fb6309bf4a371b5b2b
tree6deedb7a8ab13e68363ccdb9d680e266397f9639
parenta0f83e777660dbf7d9526c05d94fc920e459aed9
diff: clean up external-diff argv setup

Since the previous commit, setting up the tempfile for an external diff
uses df->path from the diff_filespec, rather than the logical name. This
means add_external_diff_name() does not need to take a "name" parameter
at all, and we can drop it. And that in turn lets us simplify the
conditional for handling renames (when the "other" name is non-NULL).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c