From 7bbc4e8fdb33e0a8e42e77cc05460d4c4f615f4d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 13 Feb 2014 13:40:47 -0800 Subject: [PATCH] Git 1.8.5.5 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.8.5.4.txt | 2 +- Documentation/RelNotes/1.8.5.5.txt | 37 +++++++++++++++++++++++++++++++++++++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 5 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 Documentation/RelNotes/1.8.5.5.txt diff --git a/Documentation/RelNotes/1.8.5.4.txt b/Documentation/RelNotes/1.8.5.4.txt index db3b3d3e3f..d18c40389e 100644 --- a/Documentation/RelNotes/1.8.5.4.txt +++ b/Documentation/RelNotes/1.8.5.4.txt @@ -1,7 +1,7 @@ Git v1.8.5.4 Release Notes ========================== -Fixes since v1.8.5.4 +Fixes since v1.8.5.3 -------------------- * "git fetch --depth=0" was a no-op, and was silently ignored. diff --git a/Documentation/RelNotes/1.8.5.5.txt b/Documentation/RelNotes/1.8.5.5.txt new file mode 100644 index 0000000000..9191ce948f --- /dev/null +++ b/Documentation/RelNotes/1.8.5.5.txt @@ -0,0 +1,37 @@ +Git v1.8.5.5 Release Notes +========================== + +Fixes since v1.8.5.4 +-------------------- + + * The pathspec matching code, while comparing two trees (e.g. "git + diff A B -- path1 path2") was too aggressive and failed to match + some paths when multiple pathspecs were involved. + + * "git repack --max-pack-size=8g" stopped being parsed correctly when + the command was reimplemented in C. + + * A recent update to "git send-email" broke platforms where + /etc/ssl/certs/ directory exists but cannot be used as SSL_ca_path + (e.g. Fedora rawhide). + + * A handful of bugs around interpreting $branch@{upstream} notation + and its lookalike, when $branch part has interesting characters, + e.g. "@", and ":", have been fixed. + + * "git clone" would fail to clone from a repository that has a ref + directly under "refs/", e.g. "refs/stash", because different + validation paths do different things on such a refname. Loosen the + client side's validation to allow such a ref. + + * "git log --left-right A...B" lost the "leftness" of commits + reachable from A when A is a tag as a side effect of a recent + bugfix. This is a regression in 1.8.4.x series. + + * "git merge-base --octopus" used to leave cleaning up suboptimal + result to the caller, but now it does the clean-up itself. + + * "git mv A B/", when B does not exist as a directory, should error + out, but it didn't. + +Also contains typofixes, documentation updates and trivial code clean-ups. diff --git a/Documentation/git.txt b/Documentation/git.txt index 36483181cb..64da795aba 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.5.4/git.html[documentation for release 1.8.5.4] +* link:v1.8.5.5/git.html[documentation for release 1.8.5.5] * release notes for + link:RelNotes/1.8.5.5.txt[1.8.5.5], link:RelNotes/1.8.5.4.txt[1.8.5.4], link:RelNotes/1.8.5.3.txt[1.8.5.3], link:RelNotes/1.8.5.2.txt[1.8.5.2], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index ccec5effb1..c1b7e2d2c6 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.8.5.4 +DEF_VER=v1.8.5.5 LF=' ' diff --git a/RelNotes b/RelNotes index f4ebd653fe..277f28f953 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.8.5.4.txt \ No newline at end of file +Documentation/RelNotes/1.8.5.5.txt \ No newline at end of file -- 2.11.4.GIT