summaryrefslogtreecommitdiff
path: root/Documentation/git-branch.txt
diff options
context:
space:
mode:
authorLibravatar John Keeping <john@keeping.me.uk>2016-08-15 22:54:39 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-15 15:24:05 -0700
commit45a4f5d9f99334151af90b2199004ec49a651d7a (patch)
tree578d5f3d91b2729173c3460d0332c0f3cf448e15 /Documentation/git-branch.txt
parentGit 2.9.3 (diff)
downloadtgif-45a4f5d9f99334151af90b2199004ec49a651d7a.tar.xz
difftool: always honor fatal error exit codes
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", 126 for "command found but is not executable" and values greater than 128 if the command terminated because it received a signal [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 any value of 126 or greater as a special value indicating that some form of fatal error occurred. [1] http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_08_02 Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-branch.txt')
0 files changed, 0 insertions, 0 deletions