{"thread":{"id":"17260","subject":"[PATCH] contrib/difftool: change trap condition from SIGINT to INT","startedAt":"2009-01-19T23:38:16Z","lastAt":"2009-01-19T23:38:16Z","messageCount":1,"participants":["Markus Heidelberg"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"101182","messageId":"200901200038.17548.markus.heidelberg@web.de","threadId":"17260","inReplyTo":null,"subject":"[PATCH] contrib/difftool: change trap condition from SIGINT to INT","fromName":"Markus Heidelberg","fromEmail":"markus.heidelberg@web.de","sentAt":"2009-01-19T23:38:16Z","receivedAt":"2009-01-19T23:38:16Z","isPatch":true,"sender":{"key":"markus.heidelberg@web.de","avatar":"https://avatars.githubusercontent.com/u/6334512?v=4"},"body":"git-difftool worked for me on an up-to-date Gentoo Linux at home, but\ndidn't work on a somewhat older Ubuntu Linux 7.10 at work and failed\nwith the following error, where 'Makefile' was locally modified:\n\n    trap: 244: SIGINT: bad trap\n    external diff died, stopping at Makefile.\n\nIn 'man 1p trap' there is written:\n\n    \"The condition can be EXIT, 0 (equivalent to EXIT), or a signal\n    specified using a symbolic name, without the SIG prefix, [...]\"\n\n    \"Implementations may permit names with the SIG prefix or ignore case\n    in signal names as an extension.\"\n\nSo now we do it the POSIX compliant way instead of using an extension.\n\nSigned-off-by: Markus Heidelberg <markus.heidelberg@web.de>\n---\n contrib/difftool/git-difftool-helper |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/difftool/git-difftool-helper b/contrib/difftool/git-difftool-helper\nindex f013726..a2eb59b 100755\n--- a/contrib/difftool/git-difftool-helper\n+++ b/contrib/difftool/git-difftool-helper\n@@ -53,7 +53,7 @@ launch_merge_tool () {\n \n \t# Create and ensure that we clean up $BACKUP\n \ttest -f \"$MERGED\" && cp -- \"$MERGED\" \"$BACKUP\"\n-\ttrap sigint_handler SIGINT\n+\ttrap sigint_handler INT\n \n \t# $LOCAL and $REMOTE are temporary files so prompt\n \t# the user with the real $MERGED name before launching $merge_tool.\n-- \n1.6.1.216.g3acd\n"}]}