From d8b396e17ecfe28b39b5f4470f791c434cce40ec Mon Sep 17 00:00:00 2001 From: Fabian Ruch Date: Wed, 30 Jul 2014 11:45:11 +0200 Subject: [PATCH 1/2] commit --amend: test specifies authorship but forgets to check The test case "--amend option copies authorship" specifies that the git-commit option `--amend` uses the authorship of the replaced commit for the new commit. Add the omitted check that this property actually holds. Signed-off-by: Fabian Ruch Signed-off-by: Junio C Hamano --- t/t7509-commit.sh | 1 + 1 file changed, 1 insertion(+) 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 && From 32f56600bb6ac6fc57183e79d2c1515dfa56672f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 30 Jul 2014 14:19:53 -0700 Subject: [PATCH 2/2] Git 2.0.4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.0.4.txt | 5 +++++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 Documentation/RelNotes/2.0.4.txt 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 f95911ac4..cd509775a 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: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/GIT-VERSION-GEN b/GIT-VERSION-GEN index 0d1a86c83..3e9d50827 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.0.3 +DEF_VER=v2.0.4 LF=' ' diff --git a/RelNotes b/RelNotes index 84ad4af9b..76462ab9e 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/2.0.3.txt \ No newline at end of file +Documentation/RelNotes/2.0.4.txt \ No newline at end of file