Skip to content

Commit 9aaeac9

Browse files
avargitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fcafb75 commit 9aaeac9

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

t/t4203-mailmap.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fuzz_blame () {
1313
}
1414

1515
test_expect_success setup '
16-
cat >contacts <<- EOF &&
16+
cat >contacts <<-EOF &&
1717
$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
1818
1919
EOF
@@ -33,7 +33,7 @@ test_expect_success 'check-mailmap no arguments' '
3333
'
3434

3535
test_expect_success 'check-mailmap arguments' '
36-
cat >expect <<- EOF &&
36+
cat >expect <<-EOF &&
3737
$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
3838
3939
EOF
@@ -44,7 +44,7 @@ test_expect_success 'check-mailmap arguments' '
4444
'
4545

4646
test_expect_success 'check-mailmap --stdin' '
47-
cat >expect <<- EOF &&
47+
cat >expect <<-EOF &&
4848
$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
4949
5050
EOF
@@ -195,10 +195,10 @@ test_expect_success 'No mailmap files, but configured' '
195195
test_expect_success 'setup mailmap blob tests' '
196196
git checkout -b map &&
197197
test_when_finished "git checkout master" &&
198-
cat >just-bugs <<- EOF &&
198+
cat >just-bugs <<-\EOF &&
199199
Blob Guy <[email protected]>
200200
EOF
201-
cat >both <<- EOF &&
201+
cat >both <<-EOF &&
202202
Blob Guy <$GIT_AUTHOR_EMAIL>
203203
Blob Guy <[email protected]>
204204
EOF
@@ -471,7 +471,7 @@ test_expect_success 'Log output with log.mailmap' '
471471
'
472472

473473
test_expect_success 'log.mailmap=false disables mailmap' '
474-
cat >expect <<- EOF &&
474+
cat >expect <<-EOF &&
475475
Author: CTO <[email protected]>
476476
Author: claus <[email protected]>
477477
Author: santa <[email protected]>
@@ -480,12 +480,12 @@ test_expect_success 'log.mailmap=false disables mailmap' '
480480
Author: nick1 <[email protected]>
481481
Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
482482
EOF
483-
git -c log.mailmap=False log | grep Author > actual &&
483+
git -c log.mailmap=False log | grep Author >actual &&
484484
test_cmp expect actual
485485
'
486486

487487
test_expect_success '--no-use-mailmap disables mailmap' '
488-
cat >expect <<- EOF &&
488+
cat >expect <<-EOF &&
489489
Author: CTO <[email protected]>
490490
Author: claus <[email protected]>
491491
Author: santa <[email protected]>

0 commit comments

Comments
 (0)