t6006: use test-lib.sh definitions

Use name and email definitions from test-lib.sh. Signed-off-by: Prarit Bhargava <prarit@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Prarit Bhargava committed Oct 24, 2019 at 19:36 UTC 2ae4944aac4afd3b114729ef4b5b833c7d8fd832
1 file changed +10 -10
t/t6006-rev-list-format.sh
+10 -10
@@ -111,14 +111,14 @@ EOF
111 # we don't test relative here
112 test_format author %an%n%ae%n%ad%n%aD%n%at <<EOF
113 commit $head2
114 -A U Thor
115 -author@example.com
114 +$GIT_AUTHOR_NAME
115 +$GIT_AUTHOR_EMAIL
116 Thu Apr 7 15:13:13 2005 -0700
117 Thu, 7 Apr 2005 15:13:13 -0700
118 1112911993
119 commit $head1
120 -A U Thor
121 -author@example.com
120 +$GIT_AUTHOR_NAME
121 +$GIT_AUTHOR_EMAIL
122 Thu Apr 7 15:13:13 2005 -0700
123 Thu, 7 Apr 2005 15:13:13 -0700
124 1112911993
@@ -126,14 +126,14 @@ EOF
126
127 test_format committer %cn%n%ce%n%cd%n%cD%n%ct <<EOF
128 commit $head2
129 -C O Mitter
130 -committer@example.com
129 +$GIT_COMMITTER_NAME
130 +$GIT_COMMITTER_EMAIL
131 Thu Apr 7 15:13:13 2005 -0700
132 Thu, 7 Apr 2005 15:13:13 -0700
133 1112911993
134 commit $head1
135 -C O Mitter
136 -committer@example.com
135 +$GIT_COMMITTER_NAME
136 +$GIT_COMMITTER_EMAIL
137 Thu Apr 7 15:13:13 2005 -0700
138 Thu, 7 Apr 2005 15:13:13 -0700
139 1112911993
@@ -410,7 +410,7 @@ test_expect_success 'empty email' '
410 test_tick &&
411 C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) &&
412 A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) &&
413 - verbose test "$A" = "A U Thor,,Thu Apr 7 15:14:13 2005 -0700"
413 + verbose test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700"
414 '
415
416 test_expect_success 'del LF before empty (1)' '
@@ -495,7 +495,7 @@ test_expect_success '%gd shortens ref name' '
495 '
496
497 test_expect_success 'reflog identity' '
498 - echo "C O Mitter:committer@example.com" >expect &&
498 + echo "$GIT_COMMITTER_NAME:$GIT_COMMITTER_EMAIL" >expect &&
499 git log -g -1 --format="%gn:%ge" >actual &&
500 test_cmp expect actual
501 '