mailmap tests: use our preferred whitespace syntax
Change these tests to use the preferred whitespace around ">", "<<-EOF" etc. This is an initial step in larger and more meaningful refactoring of the file, which makes a subsequent commit easier to read. I'm not changing the whitespace of "echo <str> > file" patterns to "echo <str> >file" because all of those will be changed to here-docs in a subsequent commit. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Jan 12, 2021 at 21:17 UTC
9aaeac9cf7b21ff820d724d6961495e60546b8c7
1 file changed
+8
-8
t/t4203-mailmap.sh
+8
-8
@@ -13,7 +13,7 @@ fuzz_blame () {
13
}
14
15
test_expect_success setup '
16
- cat >contacts <<- EOF &&
16
+ cat >contacts <<-EOF &&
17
$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
18
nick1 <bugs@company.xx>
19
EOF
@@ -33,7 +33,7 @@ test_expect_success 'check-mailmap no arguments' '
33
'
34
35
test_expect_success 'check-mailmap arguments' '
36
- cat >expect <<- EOF &&
36
+ cat >expect <<-EOF &&
37
$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
38
nick1 <bugs@company.xx>
39
EOF
@@ -44,7 +44,7 @@ test_expect_success 'check-mailmap arguments' '
44
'
45
46
test_expect_success 'check-mailmap --stdin' '
47
- cat >expect <<- EOF &&
47
+ cat >expect <<-EOF &&
48
$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
49
nick1 <bugs@company.xx>
50
EOF
@@ -195,10 +195,10 @@ test_expect_success 'No mailmap files, but configured' '
195
test_expect_success 'setup mailmap blob tests' '
196
git checkout -b map &&
197
test_when_finished "git checkout master" &&
198
- cat >just-bugs <<- EOF &&
198
+ cat >just-bugs <<-\EOF &&
199
Blob Guy <bugs@company.xx>
200
EOF
201
- cat >both <<- EOF &&
201
+ cat >both <<-EOF &&
202
Blob Guy <$GIT_AUTHOR_EMAIL>
203
Blob Guy <bugs@company.xx>
204
EOF
@@ -471,7 +471,7 @@ test_expect_success 'Log output with log.mailmap' '
471
'
472
473
test_expect_success 'log.mailmap=false disables mailmap' '
474
- cat >expect <<- EOF &&
474
+ cat >expect <<-EOF &&
475
Author: CTO <cto@coompany.xx>
476
Author: claus <me@company.xx>
477
Author: santa <me@company.xx>
@@ -480,12 +480,12 @@ test_expect_success 'log.mailmap=false disables mailmap' '
480
Author: nick1 <bugs@company.xx>
481
Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
482
EOF
483
- git -c log.mailmap=False log | grep Author > actual &&
483
+ git -c log.mailmap=False log | grep Author >actual &&
484
test_cmp expect actual
485
'
486
487
test_expect_success '--no-use-mailmap disables mailmap' '
488
- cat >expect <<- EOF &&
488
+ cat >expect <<-EOF &&
489
Author: CTO <cto@coompany.xx>
490
Author: claus <me@company.xx>
491
Author: santa <me@company.xx>