From mboxrd@z Thu Jan 1 00:00:00 1970 From: sean Subject: Re: git cherry unkillable Date: Sun, 22 Jan 2006 10:32:04 -0500 Message-ID: References: <200601221323.33377.arvidjaar@mail.ru> <200601221821.54461.arvidjaar@mail.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org, zsh-workers@sunsite.dk X-From: git-owner@vger.kernel.org Sun Jan 22 16:37:19 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1F0hHD-0002CZ-Dp for gcvg-git@gmane.org; Sun, 22 Jan 2006 16:37:12 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751275AbWAVPhF (ORCPT ); Sun, 22 Jan 2006 10:37:05 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751277AbWAVPhF (ORCPT ); Sun, 22 Jan 2006 10:37:05 -0500 Received: from bayc1-pasmtp03.bayc1.hotmail.com ([65.54.191.163]:13930 "EHLO BAYC1-PASMTP03.bayc1.hotmail.com") by vger.kernel.org with ESMTP id S1751275AbWAVPhD (ORCPT ); Sun, 22 Jan 2006 10:37:03 -0500 X-Originating-IP: [69.156.6.171] X-Originating-Email: [seanlkml@sympatico.ca] Received: from linux1.attic.local ([69.156.6.171]) by BAYC1-PASMTP03.bayc1.hotmail.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.1830); Sun, 22 Jan 2006 07:37:00 -0800 Received: from guru.attic.local (guru.attic.local [10.10.10.28]) by linux1.attic.local (Postfix) with ESMTP id 6D921644C23; Sun, 22 Jan 2006 10:36:59 -0500 (EST) To: Andrey Borzenkov Message-Id: <20060122103204.05a16683.seanlkml@sympatico.ca> In-Reply-To: <200601221821.54461.arvidjaar@mail.ru> X-Mailer: Sylpheed version 2.0.4 (GTK+ 2.8.10; i386-redhat-linux-gnu) X-OriginalArrivalTime: 22 Jan 2006 15:37:00.0878 (UTC) FILETIME=[AFD72EE0:01C61F69] Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org On Sun, 22 Jan 2006 18:21:53 +0300 Andrey Borzenkov wrote: > this patch fails on zsh; trap 0 never executed after signal (SIGINT to be > sure) is caught: > > #!/bin/zsh > > trap "exit 0" 1 2 3 15 > trap "echo exiting" 0 > > sleep 100000000 > > {pts/0}% /tmp/timout.zsh ^C > {pts/0}% > Damn, would be so much nicer to get this stuff out of shell scripts. Anyway, your discovery kills the idea of being able to just ignore the higher signal traps... The following implements the same idea as my second patch in hopefully a slightly more cross-shell compatible way; it works on bash and zsh at least. diff --git a/git-cherry.sh b/git-cherry.sh index 1a62320..686210b 100755 --- a/git-cherry.sh +++ b/git-cherry.sh @@ -49,7 +49,8 @@ ours=`git-rev-list $ours ^$limit` || exi tmp=.cherry-tmp$$ patch=$tmp-patch mkdir $patch -trap "rm -rf $tmp-*" 0 1 2 3 15 +trap "rm -rf $tmp-*" 0 +trap "kill -0 $$" 1 2 3 15 _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" diff --git a/git-format-patch.sh b/git-format-patch.sh index 7e67c4e..9f93bbb 100755 --- a/git-format-patch.sh +++ b/git-format-patch.sh @@ -77,7 +77,8 @@ tt) esac tmp=.tmp-series$$ -trap 'rm -f $tmp-*' 0 1 2 3 15 +trap "rm -f $tmp-*" 0 +trap "kill -0 $$" 1 2 3 15 series=$tmp-series commsg=$tmp-commsg diff --git a/git-ls-remote.sh b/git-ls-remote.sh index f699268..0cd1f07 100755 --- a/git-ls-remote.sh +++ b/git-ls-remote.sh @@ -38,7 +38,8 @@ peek_repo="$(get_remote_url "$@")" shift tmp=.ls-remote-$$ -trap "rm -fr $tmp-*" 0 1 2 3 15 +trap "rm -rf $tmp-*" 0 +trap "kill -0 $$" 1 2 3 15 tmpdir=$tmp-d case "$peek_repo" in diff --git a/git-reset.sh b/git-reset.sh index 6c9e58a..597b36e 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -4,7 +4,8 @@ USAGE='[--mixed | --soft | --hard] [