mirror of
https://github.com/git/git.git
synced 2024-05-11 14:46:08 +02:00
571f4348dd
Users often use "git difftool HEAD^" to review their work, and have "mergetool.prompt" set to false so that difftool does not prompt them before diffing each file. This is very convenient because users can see all their diffs by reviewing the xxdiff windows one at a time. A problem occurs when xxdiff encounters some binary files. It can segfault and return exit code 128, which is special-cased by git-difftool-helper as being an extraordinary situation that aborts the process. Suppress the exit code from xxdiff in its diff_cmd() implementation when we see exit code 128 so that the GIT_EXTERNAL_DIFF loop continues on uninterrupted to the next file rather than aborting when it encounters the first binary file. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> |
||
|---|---|---|
| .. | ||
| araxis | ||
| bc | ||
| codecompare | ||
| deltawalker | ||
| diffmerge | ||
| diffuse | ||
| ecmerge | ||
| emerge | ||
| examdiff | ||
| guiffy | ||
| gvimdiff | ||
| kdiff3 | ||
| kompare | ||
| meld | ||
| nvimdiff | ||
| opendiff | ||
| p4merge | ||
| smerge | ||
| tkdiff | ||
| tortoisemerge | ||
| vimdiff | ||
| winmerge | ||
| xxdiff | ||