diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-02-06 02:14:40 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-02-06 02:14:40 +0400 |
commit | 89ba81dc7643f5b126b15b15a8dcd3893d05ee47 (patch) | |
tree | 0d126b0276801de437ff849274537153594fa378 /Documentation | |
parent | c7b8cf49850c59d5583d81a30dd7d1f1d18748bf (diff) | |
parent | 3330a2c4f6b494f2b02fda2869d85bc1f8e019aa (diff) |
Sync with 1.8.5.4
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/RelNotes/1.8.5.4.txt | 48 | ||||
-rw-r--r-- | Documentation/git.txt | 3 |
2 files changed, 50 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.8.5.4.txt b/Documentation/RelNotes/1.8.5.4.txt new file mode 100644 index 0000000000..db3b3d3e3f --- /dev/null +++ b/Documentation/RelNotes/1.8.5.4.txt @@ -0,0 +1,48 @@ +Git v1.8.5.4 Release Notes +========================== + +Fixes since v1.8.5.4 +-------------------- + + * "git fetch --depth=0" was a no-op, and was silently ignored. + Diagnose it as an error. + + * Remote repository URL expressed in scp-style host:path notation are + parsed more carefully (e.g. "foo/bar:baz" is local, "[::1]:/~user" asks + to connect to user's home directory on host at address ::1. + + * SSL-related options were not passed correctly to underlying socket + layer in "git send-email". + + * "git commit -v" appends the patch to the log message before + editing, and then removes the patch when the editor returned + control. However, the patch was not stripped correctly when the + first modified path was a submodule. + + * "git mv A B/", when B does not exist as a directory, should error + out, but it didn't. + + * When we figure out how many file descriptors to allocate for + keeping packfiles open, a system with non-working getrlimit() could + cause us to die(), but because we make this call only to get a + rough estimate of how many is available and we do not even attempt + to use up all file descriptors available ourselves, it is nicer to + fall back to a reasonable low value rather than dying. + + * "git log --decorate" did not handle a tag pointed by another tag + nicely. + + * "git add -A" (no other arguments) in a totally empty working tree + used to emit an error. + + * There is no reason to have a hardcoded upper limit of the number of + parents for an octopus merge, created via the graft mechanism, but + there was. + + * The implementation of 'git stash $cmd "stash@{...}"' did not quote + the stash argument properly and left it split at IFS whitespace. + + * The documentation to "git pull" hinted there is an "-m" option + because it incorrectly shared the documentation with "git merge". + +Also contains typofixes, documentation updates and trivial code clean-ups. diff --git a/Documentation/git.txt b/Documentation/git.txt index 274d816b43..03aaa10458 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.3/git.html[documentation for release 1.8.5.3] +* link:v1.8.5.4/git.html[documentation for release 1.8.5.4] * release notes for + 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], link:RelNotes/1.8.5.1.txt[1.8.5.1], |