t8013: minimum preparatory clean-up
The closing sq for each test piece should be placed at the beginning of line. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Sep 24, 2020 at 22:10 UTC
f58931c8d69a9499ae7bc8bae2cefa18df418270
1 file changed
+11
-11
t/t8013-blame-ignore-revs.sh
+11
-11
@@ -31,7 +31,7 @@ test_expect_success setup '
31
grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
32
git rev-parse X >expect &&
33
test_cmp expect actual
34
- '
34
+'
35
36
# Ignore X, make sure A is blamed for line 1 and B for line 2.
37
test_expect_success ignore_rev_changing_lines '
@@ -44,7 +44,7 @@ test_expect_success ignore_rev_changing_lines '
44
grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
45
git rev-parse B >expect &&
46
test_cmp expect actual
47
- '
47
+'
48
49
# For ignored revs that have added 'unblamable' lines, attribute those to the
50
# ignored commit.
@@ -67,7 +67,7 @@ test_expect_success ignore_rev_adding_unblamable_lines '
67
68
grep -E "^[0-9a-f]+ [0-9]+ 4" blame_raw | sed -e "s/ .*//" >actual &&
69
test_cmp expect actual
70
- '
70
+'
71
72
# Ignore X and Y, both in separate files. Lines 1 == A, 2 == B.
73
test_expect_success ignore_revs_from_files '
@@ -82,7 +82,7 @@ test_expect_success ignore_revs_from_files '
82
grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
83
git rev-parse B >expect &&
84
test_cmp expect actual
85
- '
85
+'
86
87
# Ignore X from the config option, Y from a file.
88
test_expect_success ignore_revs_from_configs_and_files '
@@ -96,7 +96,7 @@ test_expect_success ignore_revs_from_configs_and_files '
96
grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
97
git rev-parse B >expect &&
98
test_cmp expect actual
99
- '
99
+'
100
101
# Override blame.ignoreRevsFile (ignore_x) with an empty string. X should be
102
# blamed now for lines 1 and 2, since we are no longer ignoring X.
@@ -120,7 +120,7 @@ test_expect_success bad_files_and_revs '
120
echo NOREV >ignore_norev &&
121
test_must_fail git blame file --ignore-revs-file ignore_norev 2>err &&
122
test_i18ngrep "invalid object name: NOREV" err
123
- '
123
+'
124
125
# For ignored revs that have added 'unblamable' lines, mark those lines with a
126
# '*'
@@ -138,7 +138,7 @@ test_expect_success mark_unblamable_lines '
138
139
sed -n "4p" blame_raw | cut -c1 >actual &&
140
test_cmp expect actual
141
- '
141
+'
142
143
# Commit Z will touch the first two lines. Y touched all four.
144
# A--B--X--Y--Z
@@ -171,7 +171,7 @@ test_expect_success mark_ignored_lines '
171
172
sed -n "4p" blame_raw | cut -c1 >actual &&
173
! test_cmp expect actual
174
- '
174
+'
175
176
# For ignored revs that added 'unblamable' lines and more recent commits changed
177
# the blamable lines, mark the unblamable lines with a
@@ -190,7 +190,7 @@ test_expect_success mark_unblamable_lines_intermediate '
190
191
sed -n "4p" blame_raw | cut -c1 >actual &&
192
test_cmp expect actual
193
- '
193
+'
194
195
# The heuristic called by guess_line_blames() tries to find the size of a
196
# blame_entry 'e' in the parent's address space. Those calculations need to
@@ -227,7 +227,7 @@ test_expect_success ignored_chunk_negative_parent_size '
227
git tag C &&
228
229
git blame file --ignore-rev B >blame_raw
230
- '
230
+'
231
232
# Resetting the repo and creating:
233
#
@@ -269,6 +269,6 @@ test_expect_success ignore_merge '
269
grep -E "^[0-9a-f]+ [0-9]+ 9" blame_raw | sed -e "s/ .*//" >actual &&
270
git rev-parse C >expect &&
271
test_cmp expect actual
272
- '
272
+'
273
274
test_done