diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-25 16:06:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-25 16:06:58 -0700 |
| commit | 6a1bb089fda35768b7649a91bf890e619c32e8e8 (patch) | |
| tree | 41f90efa6de206980f59b1256ac2df21fcfbff00 | |
| parent | Merge branch 'fs/ssh-signing-fix' (diff) | |
| parent | mergetools/xxdiff: prevent segfaults from stopping difftool (diff) | |
| download | git-6a1bb089fda35768b7649a91bf890e619c32e8e8.tar.gz git-6a1bb089fda35768b7649a91bf890e619c32e8e8.zip | |
Merge branch 'da/mergetools-special-case-xxdiff-exit-128'
The xxdiff difftool backend can exit with status 128, which the
difftool-helper that launches the backend takes as a significant
failure, when it is not significant at all. Work it around.
* da/mergetools-special-case-xxdiff-exit-128:
mergetools/xxdiff: prevent segfaults from stopping difftool
| -rw-r--r-- | mergetools/xxdiff | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mergetools/xxdiff b/mergetools/xxdiff index ce5b8e9f29..d5ce467995 100644 --- a/mergetools/xxdiff +++ b/mergetools/xxdiff @@ -3,6 +3,13 @@ diff_cmd () { -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl+G"' \ "$LOCAL" "$REMOTE" + + # xxdiff can segfault on binary files which are often uninteresting. + # Do not allow segfaults to stop us from continuing on to the next file. + if test $? = 128 + then + return 1 + fi } merge_cmd () { |