提交 6e06367a 编写于 作者: J Junio C Hamano

Merge branch 'maint'

* maint:
  Git 1.7.8.4
  Git 1.7.7.6
  diff-index: enable recursive pathspec matching in unpack_trees

Conflicts:
	GIT-VERSION-GEN
...@@ -8,6 +8,10 @@ Fixes since v1.7.7.5 ...@@ -8,6 +8,10 @@ Fixes since v1.7.7.5
directory when two paths in question are in adjacent directories and directory when two paths in question are in adjacent directories and
the name of the one directory is a prefix of the other. the name of the one directory is a prefix of the other.
* A wildcard that matches deeper hierarchy given to the "diff-index" command,
e.g. "git diff-index HEAD -- '*.txt'", incorrectly reported additions of
matching files even when there is no change.
* When producing a "thin pack" (primarily used in bundles and smart * When producing a "thin pack" (primarily used in bundles and smart
HTTP transfers) out of a fully packed repository, we unnecessarily HTTP transfers) out of a fully packed repository, we unnecessarily
avoided sending recent objects as a delta against objects we know avoided sending recent objects as a delta against objects we know
......
...@@ -8,6 +8,10 @@ Fixes since v1.7.8.3 ...@@ -8,6 +8,10 @@ Fixes since v1.7.8.3
directory when two paths in question are in adjacent directories and directory when two paths in question are in adjacent directories and
the name of the one directory is a prefix of the other. the name of the one directory is a prefix of the other.
* A wildcard that matches deeper hierarchy given to the "diff-index" command,
e.g. "git diff-index HEAD -- '*.txt'", incorrectly reported additions of
matching files even when there is no change.
* When producing a "thin pack" (primarily used in bundles and smart * When producing a "thin pack" (primarily used in bundles and smart
HTTP transfers) out of a fully packed repository, we unnecessarily HTTP transfers) out of a fully packed repository, we unnecessarily
avoided sending recent objects as a delta against objects we know avoided sending recent objects as a delta against objects we know
......
...@@ -44,17 +44,19 @@ unreleased) version of git, that is available from 'master' ...@@ -44,17 +44,19 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: Documentation for older releases are available here:
* link:v1.7.8.3/git.html[documentation for release 1.7.8.3] * link:v1.7.8.4/git.html[documentation for release 1.7.8.4]
* release notes for * release notes for
link:RelNotes/1.7.8.4.txt[1.7.8.4],
link:RelNotes/1.7.8.3.txt[1.7.8.3], link:RelNotes/1.7.8.3.txt[1.7.8.3],
link:RelNotes/1.7.8.2.txt[1.7.8.2], link:RelNotes/1.7.8.2.txt[1.7.8.2],
link:RelNotes/1.7.8.1.txt[1.7.8.1], link:RelNotes/1.7.8.1.txt[1.7.8.1],
link:RelNotes/1.7.8.txt[1.7.8]. link:RelNotes/1.7.8.txt[1.7.8].
* link:v1.7.7.5/git.html[documentation for release 1.7.7.5] * link:v1.7.7.6/git.html[documentation for release 1.7.7.6]
* release notes for * release notes for
link:RelNotes/1.7.7.6.txt[1.7.7.6],
link:RelNotes/1.7.7.5.txt[1.7.7.5], link:RelNotes/1.7.7.5.txt[1.7.7.5],
link:RelNotes/1.7.7.4.txt[1.7.7.4], link:RelNotes/1.7.7.4.txt[1.7.7.4],
link:RelNotes/1.7.7.3.txt[1.7.7.3], link:RelNotes/1.7.7.3.txt[1.7.7.3],
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册