From 6a1f79c1f1a54f97f122a86c71837fb1f1408b67 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Wed, 1 Feb 2006 00:40:33 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- diff.c | 2 ++ index.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/diff.c b/diff.c index 8ae6dbc64e..ec51e7dd18 100644 --- a/diff.c +++ b/diff.c @@ -555,6 +555,8 @@ static void remove_tempfile(void) static void remove_tempfile_on_signal(int signo) { remove_tempfile(); + signal(SIGINT, SIG_DFL); + raise(signo); } /* An external diff command takes: diff --git a/index.c b/index.c index ad0eafedc2..f92b960ae4 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) -- 2.11.4.GIT