Sync with 1.8.3.1

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

diff --combined Documentation/git.txt
index 68f1ee60cf1a3efa60fdd6219d7710586aea79c4,443d88ff12362b044054524270f99cb6e975f01a..fcbca8db7787b2046427522a6cdb5204625bc226
--- 1/Documentation/git.txt
--- 2/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 b295e2f6a9faf25927ab6e69ccaf1c2d6a86c420,dae30a081c03b28aa7b89489ffd01b6ce24e8070..bb92c436f70790ba907991f3307aa0fe4afdf0f5
--- 1/compat/mingw.c
--- 2/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;