]> git.ipfire.org Git - thirdparty/git.git/commit
git-difftool--helper.sh: exit upon initialize_merge_tool errors
authorPhilippe Blain <levraiphilippeblain@gmail.com>
Fri, 22 Nov 2024 19:50:22 +0000 (19:50 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Nov 2024 02:59:19 +0000 (11:59 +0900)
commitdbaece3526c30efab07f7f06c849bd8deaf62249
tree62c0a3812f33834776ab52cb04afd1d5fe7e7ec0
parentacca46d12464cc64b623b104c04977d8db1a9591
git-difftool--helper.sh: exit upon initialize_merge_tool errors

Since the introduction of 'initialize_merge_tool' in de8dafbada
(mergetool: break setup_tool out into separate initialization function,
2021-02-09), any errors from this function are ignored in
git-difftool--helper.sh::launch_merge_tool, which is not the case for
its call in git-mergetool.sh::merge_file.

Despite the in-code comment, initialize_merge_tool (via its call to
setup_tool) does different checks than run_merge_tool, so it makes sense
to abort early if it encounters errors. Add exit calls if
initialize_merge_tool fails.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-difftool--helper.sh