Skip to content

Commit

Permalink
Sync with 2.0.4
Browse files Browse the repository at this point in the history
* maint:
  Git 2.0.4
  commit --amend: test specifies authorship but forgets to check
  • Loading branch information
Junio C Hamano committed Jul 30, 2014
2 parents aa0ba07 + 32f5660 commit aa544bf
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
5 changes: 5 additions & 0 deletions Documentation/RelNotes/2.0.4.txt
Original file line number Diff line number Diff line change
@@ -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.
3 changes: 2 additions & 1 deletion Documentation/git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
1 change: 1 addition & 0 deletions t/t7509-commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down

0 comments on commit aa544bf

Please sign in to comment.