From 251e7dad517bd369387c4dedfe77b380f025e0f3 Mon Sep 17 00:00:00 2001 From: John Szakmeister Date: Tue, 4 Nov 2014 15:01:12 -0500 Subject: [PATCH] diff-highlight: exit when a pipe is broken While using diff-highlight with other tools, I have discovered that Python ignores SIGPIPE by default. Unfortunately, this also means that tools attempting to launch a pager under Python--and don't realize this is happening--means that the subprocess inherits this setting. In this case, it means diff-highlight will be launched with SIGPIPE being ignored. Let's work with those broken scripts by restoring the default SIGPIPE handler. Signed-off-by: John Szakmeister Acked-by: Jeff King Signed-off-by: Junio C Hamano --- contrib/diff-highlight/diff-highlight | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/diff-highlight/diff-highlight b/contrib/diff-highlight/diff-highlight index c4404d49c9..69a652e7b2 100755 --- a/contrib/diff-highlight/diff-highlight +++ b/contrib/diff-highlight/diff-highlight @@ -14,6 +14,10 @@ my @removed; my @added; my $in_hunk; +# Some scripts may not realize that SIGPIPE is being ignored when launching the +# pager--for instance scripts written in Python. +$SIG{PIPE} = 'DEFAULT'; + while (<>) { if (!$in_hunk) { print; -- 2.11.4.GIT