admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-difftool--helper.sh: exit upon initialize_merge_tool errors

Browse Source 
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>
This commit is contained in:
Philippe Blain
2024-11-22 19:50:22 +00:00
committed by Junio C Hamano
parent acca46d124
commit dbaece3526
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
git-difftool--helper.sh
View File

@@ -61,9 +61,7 @@ launch_merge_tool () {
export BASE export BASE
eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"' eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
else else
initialize_merge_tool "$merge_tool" initialize_merge_tool "$merge_tool" || exit 1
# ignore the error from the above --- run_merge_tool
# will diagnose unusable tool by itself
run_merge_tool "$merge_tool" run_merge_tool "$merge_tool"
fi fi
} }
@@ -87,9 +85,7 @@ if test -n "$GIT_DIFFTOOL_DIRDIFF"
then then
LOCAL="$1" LOCAL="$1"
REMOTE="$2" REMOTE="$2"
initialize_merge_tool "$merge_tool" initialize_merge_tool "$merge_tool" || exit 1
# ignore the error from the above --- run_merge_tool
# will diagnose unusable tool by itself
run_merge_tool "$merge_tool" false run_merge_tool "$merge_tool" false
status=$? status=$?