t/t8*: merge "grep | sed" pipelines
Signed-off-by: Beat Bolli <dev+git@drbeat.li> Acked-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Beat Bolli committed
Mar 15, 2024 at 20:46 UTC
c7e7f68aad5d7f595bcb6bf4e476a857ef57145f
1 file changed
+14
-14
t/t8013-blame-ignore-revs.sh
+14
-14
@@ -25,11 +25,11 @@ test_expect_success setup '
25
26
git blame --line-porcelain file >blame_raw &&
27
28
- grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
28
+ sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
29
git rev-parse X >expect &&
30
test_cmp expect actual &&
31
32
- grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
32
+ sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
33
git rev-parse X >expect &&
34
test_cmp expect actual
35
'
@@ -53,11 +53,11 @@ do
53
test_expect_success "ignore_rev_changing_lines ($I)" '
54
git blame --line-porcelain --ignore-rev $I file >blame_raw &&
55
56
- grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
56
+ sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
57
git rev-parse A >expect &&
58
test_cmp expect actual &&
59
60
- grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
60
+ sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
61
git rev-parse B >expect &&
62
test_cmp expect actual
63
'
@@ -79,10 +79,10 @@ test_expect_success ignore_rev_adding_unblamable_lines '
79
git rev-parse Y >expect &&
80
git blame --line-porcelain file --ignore-rev Y >blame_raw &&
81
82
- grep -E "^[0-9a-f]+ [0-9]+ 3" blame_raw | sed -e "s/ .*//" >actual &&
82
+ sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 3/s/ .*//p" blame_raw >actual &&
83
test_cmp expect actual &&
84
85
- grep -E "^[0-9a-f]+ [0-9]+ 4" blame_raw | sed -e "s/ .*//" >actual &&
85
+ sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 4/s/ .*//p" blame_raw >actual &&
86
test_cmp expect actual
87
'
88
@@ -92,11 +92,11 @@ test_expect_success ignore_revs_from_files '
92
git rev-parse Y >ignore_y &&
93
git blame --line-porcelain file --ignore-revs-file ignore_x --ignore-revs-file ignore_y >blame_raw &&
94
95
- grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
95
+ sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
96
git rev-parse A >expect &&
97
test_cmp expect actual &&
98
99
- grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
99
+ sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
100
git rev-parse B >expect &&
101
test_cmp expect actual
102
'
@@ -106,11 +106,11 @@ test_expect_success ignore_revs_from_configs_and_files '
106
git config --add blame.ignoreRevsFile ignore_x &&
107
git blame --line-porcelain file --ignore-revs-file ignore_y >blame_raw &&
108
109
- grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
109
+ sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
110
git rev-parse A >expect &&
111
test_cmp expect actual &&
112
113
- grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
113
+ sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
114
git rev-parse B >expect &&
115
test_cmp expect actual
116
'
@@ -121,10 +121,10 @@ test_expect_success override_ignore_revs_file '
121
git blame --line-porcelain file --ignore-revs-file "" --ignore-revs-file ignore_y >blame_raw &&
122
git rev-parse X >expect &&
123
124
- grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
124
+ sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
125
test_cmp expect actual &&
126
127
- grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
127
+ sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
128
test_cmp expect actual
129
'
130
test_expect_success bad_files_and_revs '
@@ -279,11 +279,11 @@ test_expect_success ignore_merge '
279
test_merge M B &&
280
git blame --line-porcelain file --ignore-rev M >blame_raw &&
281
282
- grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
282
+ sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
283
git rev-parse B >expect &&
284
test_cmp expect actual &&
285
286
- grep -E "^[0-9a-f]+ [0-9]+ 9" blame_raw | sed -e "s/ .*//" >actual &&
286
+ sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 9/s/ .*//p" blame_raw >actual &&
287
git rev-parse C >expect &&
288
test_cmp expect actual
289
'