Sync with 1.8.3.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-06-10 12:35:32 -07:00
parent 1462b67bc8 362de916c0
commit 39fd762572
5 changed files with 24 additions and 5 deletions
--- a/compat/mingw.c
+++ b/compat/mingw.c
@ -1677,14 +1677,16 @@ int sigaction(int sig, struct sigaction *in, struct sigaction *out)
 #undef signal
 sig_handler_t mingw_signal(int sig, sig_handler_t handler)
 {
-	sig_handler_t old = timer_fn;
+	sig_handler_t old;

 	switch (sig) {
 	case SIGALRM:
+		old = timer_fn;
 		timer_fn = handler;
 		break;

 	case SIGINT:
+		old = sigint_fn;
 		sigint_fn = handler;
 		break;