From 94b540479aba44cfe64c7a5e051dc490179cefff Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 28 Jun 2013 19:19:42 +0200 Subject: [PATCH 1/2] configure: fix option help message for --disable-pthreads The configure option to disable threading is '--disable-pthreads', not '--without-pthreads'. Signed-off-by: Stefano Lattarini Signed-off-by: Junio C Hamano --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f3462d9c8..2f433939d 100644 --- a/configure.ac +++ b/configure.ac @@ -193,7 +193,7 @@ AC_ARG_ENABLE([pthreads], [FLAGS is the value to pass to the compiler to enable POSIX Threads.] [The default if FLAGS is not specified is to try first -pthread] [and then -lpthread.] - [--without-pthreads will disable threading.])], + [--disable-pthreads will disable threading.])], [ if test "x$enableval" = "xyes"; then AC_MSG_NOTICE([Will try -pthread then -lpthread to enable POSIX Threads]) From 3a461832c5ca4f140e41fdc34f86c90868aea33b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 28 Jun 2013 14:56:30 -0700 Subject: [PATCH 2/2] Git 1.8.3.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.8.3.2.txt | 5 +++++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Documentation/RelNotes/1.8.3.2.txt b/Documentation/RelNotes/1.8.3.2.txt index 47ae496b7..26ae142c3 100644 --- a/Documentation/RelNotes/1.8.3.2.txt +++ b/Documentation/RelNotes/1.8.3.2.txt @@ -4,6 +4,11 @@ Git v1.8.3.2 Release Notes Fixes since v1.8.3.1 -------------------- + * Cloning with "git clone --depth N" while fetch.fsckobjects (or + transfer.fsckobjects) is set to true did not tell the cut-off + points of the shallow history to the process that validates the + objects and the history received, causing the validation to fail. + * "git checkout foo" DWIMs the intended "upstream" and turns it into "git checkout -t -b foo remotes/origin/foo". This codepath has been updated to correctly take existing remote definitions into account. diff --git a/Documentation/git.txt b/Documentation/git.txt index 443d88ff1..0c3dd1e40 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.8.3.1/git.html[documentation for release 1.8.3.1] +* link:v1.8.3.2/git.html[documentation for release 1.8.3.2] * release notes for + link:RelNotes/1.8.3.2.txt[1.8.3.2], link:RelNotes/1.8.3.1.txt[1.8.3.1], link:RelNotes/1.8.3.txt[1.8.3]. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index eeecb5d9f..45ead76e1 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.8.3.1 +DEF_VER=v1.8.3.2 LF=' '