undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

contrib/difftool: change trap condition from SIGINT to INT

Browse Source 
git-difftool worked for me on an up-to-date Gentoo Linux at home, but
didn't work on a somewhat older Ubuntu Linux 7.10 at work and failed
with the following error, where 'Makefile' was locally modified:

    trap: 244: SIGINT: bad trap
    external diff died, stopping at Makefile.

In 'man 1p trap' there is written:

    "The condition can be EXIT, 0 (equivalent to EXIT), or a signal
    specified using a symbolic name, without the SIG prefix, [...]"

    "Implementations may permit names with the SIG prefix or ignore case
    in signal names as an extension."

So now we do it the POSIX compliant way instead of using an extension.

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Markus Heidelberg 2009-01-20 00:38:16 +01:00 committed by Junio C Hamano
parent c5ee71fded
commit f13bfc1be7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/difftool/git-difftool-helper
View File

@ -53,7 +53,7 @@ launch_merge_tool () {
# Create and ensure that we clean up $BACKUP # Create and ensure that we clean up $BACKUP
test -f "$MERGED" && cp -- "$MERGED" "$BACKUP" test -f "$MERGED" && cp -- "$MERGED" "$BACKUP"
trap sigint_handler SIGINT trap sigint_handler INT
# $LOCAL and $REMOTE are temporary files so prompt # $LOCAL and $REMOTE are temporary files so prompt
# the user with the real $MERGED name before launching $merge_tool. # the user with the real $MERGED name before launching $merge_tool.