From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jun 2013 19:35:32 +0000 (-0700)
Subject: Sync with 1.8.3.1
X-Git-Tag: v1.8.4-rc0~197
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/39fd762572d42a118e577d9095d83d84f3db9ddf?ds=inline;hp=-c

Sync with 1.8.3.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

39fd762572d42a118e577d9095d83d84f3db9ddf
diff --combined Documentation/git.txt
index 68f1ee60cf,443d88ff12..fcbca8db77
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,17 -43,18 +43,18 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v1.8.3/git.html[documentation for release 1.8.3]
+ * link:v1.8.3.1/git.html[documentation for release 1.8.3.1]
  
  * release notes for
+   link:RelNotes/1.8.3.1.txt[1.8.3.1],
    link:RelNotes/1.8.3.txt[1.8.3].
  
  * link:v1.8.2.3/git.html[documentation for release 1.8.2.3]
  
  * release notes for
 -  link:RelNotes/1.8.2.3.txt[1.8.2.3].
 -  link:RelNotes/1.8.2.2.txt[1.8.2.2].
 -  link:RelNotes/1.8.2.1.txt[1.8.2.1].
 +  link:RelNotes/1.8.2.3.txt[1.8.2.3],
 +  link:RelNotes/1.8.2.2.txt[1.8.2.2],
 +  link:RelNotes/1.8.2.1.txt[1.8.2.1],
    link:RelNotes/1.8.2.txt[1.8.2].
  
  * link:v1.8.1.6/git.html[documentation for release 1.8.1.6]
@@@ -816,9 -817,8 +817,9 @@@ for further details
  'GIT_FLUSH'::
  	If this environment variable is set to "1", then commands such
  	as 'git blame' (in incremental mode), 'git rev-list', 'git log',
 -	and 'git whatchanged' will force a flush of the output stream
 -	after each commit-oriented record have been flushed.   If this
 +	'git check-attr', 'git check-ignore', and 'git whatchanged' will
 +	force a flush of the output stream after each record have been
 +	flushed. If this
  	variable is set to "0", the output of these commands will be done
  	using completely buffered I/O.   If this environment variable is
  	not set, Git will choose buffered or record-oriented flushing
diff --combined compat/mingw.c
index b295e2f6a9,dae30a081c..bb92c436f7
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@@ -841,8 -841,8 +841,8 @@@ struct pinfo_t 
  	struct pinfo_t *next;
  	pid_t pid;
  	HANDLE proc;
 -} pinfo_t;
 -struct pinfo_t *pinfo = NULL;
 +};
 +static struct pinfo_t *pinfo = NULL;
  CRITICAL_SECTION pinfo_cs;
  
  static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **env,
@@@ -1253,7 -1253,7 +1253,7 @@@ static int WSAAPI getaddrinfo_stub(cons
  	else
  		sin->sin_addr.s_addr = INADDR_LOOPBACK;
  	ai->ai_addr = (struct sockaddr *)sin;
 -	ai->ai_next = 0;
 +	ai->ai_next = NULL;
  	return 0;
  }
  
@@@ -1677,14 -1677,16 +1677,16 @@@ int sigaction(int sig, struct sigactio
  #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;