At the moment difftool's "trust exit code" logic always suppresses the exit status of the diff utility we invoke. This is useful because we don't want to exit just because diff returned "1" because the files differ, but it's confusing if the shell returns an error because the selected diff utility is not found.
POSIX specifies 127 as the exit status for "command not found" and 126 for "command found but is not executable" [1] and at least bash and dash follow this specification, while diff utilities generally use "1" for the exit status we want to ignore. Handle 126 and 127 as special values, assuming that they always mean that the command could not be executed. [1] http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_08_02 Signed-off-by: John Keeping <j...@keeping.me.uk> --- On Sat, Aug 13, 2016 at 11:36:39AM +0100, John Keeping wrote: > It would be nice if there was a way to differentiate between complete > failure and just the diff tool exiting with a non-zero return status > because the files differ, but I'm not sure whether we can do that > reliably. POSIX uses 127 and 126 as errors that mean the command didn't > run [1] so it may be sensible to to treat those as special values. Something like this perhaps? I think this is probably safe, but it's always possible that some diff utility does use 126 or 127 as a "normal" exit status. I'm not sure what we can do about that other than add a "really, really don't trust the exit status" option! git-difftool--helper.sh | 18 ++++++++++++++---- t/t7800-difftool.sh | 6 ++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh index 84d6cc0..68877d4 100755 --- a/git-difftool--helper.sh +++ b/git-difftool--helper.sh @@ -86,11 +86,21 @@ else do launch_merge_tool "$1" "$2" "$5" status=$? - if test "$status" != 0 && - test "$GIT_DIFFTOOL_TRUST_EXIT_CODE" = true - then + case "$status" in + 0) + : OK + ;; + 126|127) + # Command not found or not executable exit $status - fi + ;; + *) + if test "$GIT_DIFFTOOL_TRUST_EXIT_CODE" = true + then + exit $status + fi + ;; + esac shift 7 done fi diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 2974900..70a2de4 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -124,6 +124,12 @@ test_expect_success PERL 'difftool stops on error with --trust-exit-code' ' test_cmp expect actual ' +test_expect_success PERL 'difftool honors exit status if command not found' ' + test_config difftool.nonexistent.cmd i-dont-exist && + test_config difftool.trustExitCode false && + test_must_fail git difftool -y -t nonexistent branch +' + test_expect_success PERL 'difftool honors --gui' ' difftool_test_setup && test_config merge.tool bogus-tool && -- 2.9.2.639.g855ae9f -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
