threads / patch / 10657

patcht7501-commit.sh: Add test case for fixing author in amend commit.

Subject: [PATCH] t7501-commit.sh: Add test case for fixing author in amend commit.

## tl;dr

4 messages between Nov 5, 2007 and Nov 5, 2007. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Kristian Høgsberg· Nov 5, 2007, 03:42 UTC · lore

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
---
 t/t7501-commit.sh |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

Show changes to t/t7501-commit.sh +16 −0

diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index b151b51..7a37c13 100644
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -151,6 +151,7 @@ test_expect_success 'partial commit that involves removal (2)' '
 	diff expected current
 
 '
+test_tick
 
 test_expect_success 'partial commit that involves removal (3)' '
 
@@ -163,4 +164,19 @@ test_expect_success 'partial commit that involves removal (3)' '
 
 '
 
+oldtick=$GIT_AUTHOR_DATE
+test_tick
+
+author="The Real Author <someguy@his.email.org>"
+committer="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE"
+
+test_expect_success 'amend commit to fix author' '
+
+	git reset --hard
+	git cat-file -p HEAD | sed -e "s/author.*/author $author $oldtick/" -e "s/committer.*/committer $committer/" > expected &&
+	git commit --amend --author="$author" &&
+	git cat-file -p HEAD > current &&
+	diff expected current
+	
+'
 test_done

-- 
1.5.3.5.1527.g6161-dirty

Johannes Schindelin· Nov 5, 2007, 10:24 UTC · re: Kristian Høgsberg · lore

Re: [PATCH] t7501-commit.sh: Add test case for fixing author in amend commit.

Hi,

On Sun, 4 Nov 2007, Kristian Høgsberg wrote:

> +test_tick
>  
>  test_expect_success 'partial commit that involves removal (3)' '

We usually put the test_tick into the test case.  IOW

	test_expect_success 'message' '
		test_tick &&
		...

Show 9 quoted lines

>  '
>  
> +oldtick=$GIT_AUTHOR_DATE
> +test_tick
> +
> +author="The Real Author <someguy@his.email.org>"
> +committer="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE"
> +
> +test_expect_success 'amend commit to fix author' '

Same here.

BTW: is this committer mangling really necessary? I thought only 
GIT_COMMITTER_DATE was relevant.  And that is easily replaced by

	sed -e "s/^\(committer.* \)[0-9][0-9]*$/\1$GIT_COMMITTER_DATE/"

Ciao, Dscho

Kristian Høgsberg· Nov 5, 2007, 17:17 UTC · re: Johannes Schindelin · lore

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
---

How about this?

 t/t7501-commit.sh |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

Show changes to t/t7501-commit.sh +15 −0

diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index b151b51..c5d122f 100644
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -163,4 +163,19 @@ test_expect_success 'partial commit that involves removal (3)' '
 
 '
 
+author="The Real Author <someguy@his.email.org>"
+test_expect_success 'amend commit to fix author' '
+
+	oldtick=$GIT_AUTHOR_DATE &&
+	test_tick &&
+	git reset --hard &&
+	git cat-file -p HEAD |
+	sed -e "s/author.*/author $author $oldtick/" \
+		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
+		expected &&
+	git commit --amend --author="$author" &&
+	git cat-file -p HEAD > current &&
+	diff expected current
+	
+'
 test_done

-- 
1.5.3.4

Junio C Hamano· Nov 5, 2007, 21:23 UTC · re: Kristian Høgsberg · lore

Re: [PATCH] t7501-commit.sh: Add test case for fixing author in amend commit.

Kristian Høgsberg <krh@redhat.com> writes:

> Signed-off-by: Kristian Høgsberg <krh@redhat.com>
> ---
>
> How about this?

Looks Ok; will queue.

Thanks.