]> git.ipfire.org Git - thirdparty/git.git/commit
difftool: prepare "diff" cmdline in cmd_difftool()
authorJeff King <peff@peff.net>
Mon, 13 Sep 2021 03:35:38 +0000 (05:35 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Sep 2021 06:27:38 +0000 (23:27 -0700)
commitb4c7aab7b9fa7f97c6328751b2cc429189b08514
tree7fa3678faea7f33c67209c59ce79880741114062
parentec3cc27ab06c0b7ebaf9aee3eaa6e35719eef8da
difftool: prepare "diff" cmdline in cmd_difftool()

We call into either run_dir_diff() or run_file_diff(), each of which
sets up a child argv starting with "diff" and some hard-coded options
(depending on which mode we're using). Let's extract that logic into the
caller, which will make it easier to modify the options for cases which
affect both functions.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/difftool.c