# [PATCH] t7501-commit.sh: Add test case for fixing author in amend commit. 4 messages from 2007-11-05 to 2007-11-05. Participants: Kristian Høgsberg, Johannes Schindelin, Junio C Hamano. Thread: https://gitlist.dev/t/10657 ## Kristian Høgsberg, 2007-11-05 03:42 Subject: [PATCH] t7501-commit.sh: Add test case for fixing author in amend commit. Message-ID: <1194234165-9498-1-git-send-email-krh@redhat.com> URL: https://gitlist.dev/e/1194234165-9498-1-git-send-email-krh%40redhat.com ``` Signed-off-by: Kristian Høgsberg --- t/t7501-commit.sh | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) 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 " +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, 2007-11-05 10:24 Subject: Re: [PATCH] t7501-commit.sh: Add test case for fixing author in amend commit. Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0711051020330.4362%40racer.site In-Reply-To: <1194234165-9498-1-git-send-email-krh@redhat.com> ``` 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 && ... > ' > > +oldtick=$GIT_AUTHOR_DATE > +test_tick > + > +author="The Real Author " > +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, 2007-11-05 17:17 Subject: [PATCH] t7501-commit.sh: Add test case for fixing author in amend commit. Message-ID: <1194283047-16565-1-git-send-email-krh@redhat.com> URL: https://gitlist.dev/e/1194283047-16565-1-git-send-email-krh%40redhat.com In-Reply-To: ``` Signed-off-by: Kristian Høgsberg --- How about this? t/t7501-commit.sh | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) 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 " +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, 2007-11-05 21:23 Subject: Re: [PATCH] t7501-commit.sh: Add test case for fixing author in amend commit. Message-ID: <7vpryoo08j.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vpryoo08j.fsf%40gitster.siamese.dyndns.org In-Reply-To: <1194283047-16565-1-git-send-email-krh@redhat.com> ``` Kristian Høgsberg writes: > Signed-off-by: Kristian Høgsberg > --- > > How about this? Looks Ok; will queue. Thanks. ```