From: Junio C Hamano Date: Thu, 7 Feb 2013 23:21:10 +0000 (-0800) Subject: Git 1.8.1.3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f3500825257b441134bd99b08bab3b6fd1cb4f51;p=git.git Git 1.8.1.3 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/RelNotes/1.8.1.3.txt b/Documentation/RelNotes/1.8.1.3.txt index 03bd33058..681cb35c0 100644 --- a/Documentation/RelNotes/1.8.1.3.txt +++ b/Documentation/RelNotes/1.8.1.3.txt @@ -12,6 +12,14 @@ Fixes since v1.8.1.2 * Command line completion code was inadvertently made incompatible with older versions of bash by using a newer array notation. + * Scripts to test bash completion was inherently flaky as it was + affected by whatever random things the user may have on $PATH. + + * A fix was added to the build procedure to work around buggy + versions of ccache broke the auto-generation of dependencies, which + unfortunately is still relevant because some people use ancient + distros. + * We used to stuff "user@" and then append what we read from /etc/mailname to come up with a default e-mail ident, but a bug lost the "user@" part. @@ -22,7 +30,18 @@ Fixes since v1.8.1.2 * Attempt to "branch --edit-description" an existing branch, while being on a detached HEAD, errored out. + * "git cherry-pick" did not replay a root commit to an unborn branch. + + * We forgot to close the file descriptor reading from "gpg" output, + killing "git log --show-signature" on a long history. + * "git rebase --preserve-merges" lost empty merges in recent versions of Git. + * Rebasing the history of superproject with change in the submodule + has been broken since v1.7.12. + + * A failure to push due to non-ff while on an unborn branch + dereferenced a NULL pointer when showing an error message. + Also contains various documentation fixes. diff --git a/Documentation/git.txt b/Documentation/git.txt index 276491223..c7f211e81 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,11 @@ 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.1.1/git.html[documentation for release 1.8.1.1] +* link:v1.8.1.3/git.html[documentation for release 1.8.1.3] * release notes for + link:RelNotes/1.8.1.3.txt[1.8.1.3], + link:RelNotes/1.8.1.2.txt[1.8.1.2], link:RelNotes/1.8.1.1.txt[1.8.1.1], link:RelNotes/1.8.1.txt[1.8.1]. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 2edb996ab..07685f469 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.8.1.2 +DEF_VER=v1.8.1.3 LF=' '