Sync with 2.0.4

* maint:
Git 2.0.4
commit --amend: test specifies authorship but forgets to check

diff --git a/Documentation/RelNotes/2.0.4.txt b/Documentation/RelNotes/2.0.4.txt
new file mode 100644 (file)
index 0000000..7e34092
--- /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 a0f1ede86603b181c09dc89bc1a9e634c92b273a..b1c4f7a56f485d04a9a31c0657e6d1291dd72160 100644 (file)
--- 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 b61fd3c3c4c949785a595dac0fdcc48f4f7faf93..9ac794052df6ac925733ff8a8852e9759bb0baf0 100755 (executable)
--- 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 &&