diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-30 14:25:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-30 14:25:46 -0700 |
| commit | aa544bfbc6eb11e4f0471f3144d3e3ac75c0e4a9 (patch) | |
| tree | 7f6c0ffe23e638444f270032b381941b6647ab65 | |
| parent | aa0ba07a026db61af7d95057dd3eb8b6c819dd06 (diff) | |
| parent | 32f56600bb6ac6fc57183e79d2c1515dfa56672f (diff) | |
| download | git-aa544bfbc6eb11e4f0471f3144d3e3ac75c0e4a9.tar.gz git-aa544bfbc6eb11e4f0471f3144d3e3ac75c0e4a9.tar.xz | |
Sync with 2.0.4
* maint:
Git 2.0.4
commit --amend: test specifies authorship but forgets to check
| -rw-r--r-- | Documentation/RelNotes/2.0.4.txt | 5 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rwxr-xr-x | t/t7509-commit.sh | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.0.4.txt b/Documentation/RelNotes/2.0.4.txt new file mode 100644 index 000000000..7e340921a --- /dev/null +++ b/Documentation/RelNotes/2.0.4.txt @@ -0,0 +1,5 @@ +Git v2.0.4 Release Notes +======================== + + * An earlier update to v2.0.2 broken output from "git diff-tree", + which is fixed in this release. diff --git a/Documentation/git.txt b/Documentation/git.txt index a0f1ede86..b1c4f7a56 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v2.0.3/git.html[documentation for release 2.0.3] +* link:v2.0.4/git.html[documentation for release 2.0.4] * release notes for + link:RelNotes/2.0.4.txt[2.0.4], link:RelNotes/2.0.3.txt[2.0.3], link:RelNotes/2.0.2.txt[2.0.2], link:RelNotes/2.0.1.txt[2.0.1], diff --git a/t/t7509-commit.sh b/t/t7509-commit.sh index b61fd3c3c..9ac794052 100755 --- a/t/t7509-commit.sh +++ b/t/t7509-commit.sh @@ -77,6 +77,7 @@ test_expect_success '--amend option copies authorship' ' git commit -a --amend -m "amend test" && author_header Initial >expect && author_header HEAD >actual && + test_cmp expect actual && echo "amend test" >expect && message_body HEAD >actual && |