summaryrefslogtreecommitdiff
path: root/index.c
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2006-01-31 23:40:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-02 03:47:52 (GMT)
commit6a1f79c1f1a54f97f122a86c71837fb1f1408b67 (patch)
tree3514ef70261e0822a0b0e2f2f51651e85fd81453 /index.c
parent884944239f2ab673cedfaa5e7999d31fd6a46331 (diff)
downloadgit-6a1f79c1f1a54f97f122a86c71837fb1f1408b67.zip
git-6a1f79c1f1a54f97f122a86c71837fb1f1408b67.tar.gz
git-6a1f79c1f1a54f97f122a86c71837fb1f1408b67.tar.bz2
Allow diff and index commands to be interrupted
So far, e.g. git-update-index --refresh was basically uninterruptable by ctrl-c, since it hooked the SIGINT handler, but that handler would only unlink the lockfile but not actually quit. This makes it propagate the signal to the default handler. Note that I expected it to work without resetting the signal handler to SIG_DFL, but without that it ended in an infinite loop of tgkill()s - is my glibc violating SUS or what? Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'index.c')
-rw-r--r--index.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/index.c b/index.c
index ad0eafe..f92b960 100644
--- a/index.c
+++ b/index.c
@@ -18,6 +18,8 @@ static void remove_lock_file(void)
static void remove_lock_file_on_signal(int signo)
{
remove_lock_file();
+ signal(SIGINT, SIG_DFL);
+ raise(signo);
}
int hold_index_file_for_update(struct cache_file *cf, const char *path)