| commit | f13bfc1be7d25955e3ff5563fb6e35d03a408b4e | |
| author | Markus Heidelberg <markus.heidelberg@web.de> | |
| Mon, 19 Jan 2009 23:38:16 +0000 (20 00:38 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 20 Jan 2009 06:39:15 +0000 (19 22:39 -0800) | ||
| tree | daf880cb1361c38b4f790fec6a93ffde4493747e | treesnapshot (tar.gz zip) |
| parent | c5ee71fdeda21aef8a65366a3f66aa7cbe58cba0 | commitdiff |
contrib/difftool: change trap condition from SIGINT to INT
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>
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>
| contrib/difftool/git-difftool-helper | diffblobblamehistory |