@@ -49,77 +49,56 @@ test_expect_success setup '
4949'
5050
5151test_expect_success ' straight copy without -C' '
52-
5352 git blame uno >actual &&
5453 test_grep Second actual
55-
5654'
5755
5856test_expect_success ' straight move without -C' '
59-
6057 git blame dos >actual &&
6158 test_grep Initial actual
62-
6359'
6460
6561test_expect_success ' straight copy with -C' '
66-
6762 git blame -C1 uno >actual &&
6863 test_grep Second actual
69-
7064'
7165
7266test_expect_success ' straight move with -C' '
73-
7467 git blame -C1 dos >actual &&
7568 test_grep Initial actual
76-
7769'
7870
7971test_expect_success ' straight copy with -C -C' '
80-
8172 git blame -C -C1 uno >actual &&
8273 test_grep Initial actual
83-
8474'
8575
8676test_expect_success ' straight move with -C -C' '
87-
8877 git blame -C -C1 dos >actual &&
8978 test_grep Initial actual
90-
9179'
9280
9381test_expect_success ' append without -C' '
94-
9582 git blame -L2 tres >actual &&
9683 test_grep Second actual
97-
9884'
9985
10086test_expect_success ' append with -C' '
101-
10287 git blame -L2 -C1 tres >actual &&
10388 test_grep Second actual
104-
10589'
10690
10791test_expect_success ' append with -C -C' '
108-
10992 git blame -L2 -C -C1 tres >actual &&
11093 test_grep Second actual
111-
11294'
11395
11496test_expect_success ' append with -C -C -C' '
115-
11697 git blame -L2 -C -C -C1 tres >actual &&
11798 test_grep Initial actual
118-
11999'
120100
121101test_expect_success ' blame wholesale copy' '
122-
123102 git blame -f -C -C1 HEAD^ -- cow >actual &&
124103 sed -e "$pick_fc" actual >current &&
125104 cat >expected <<-\EOF &&
@@ -128,11 +107,9 @@ test_expect_success 'blame wholesale copy' '
128107 mouse-Third
129108 EOF
130109 test_cmp expected current
131-
132110'
133111
134112test_expect_success ' blame wholesale copy and more' '
135-
136113 git blame -f -C -C1 HEAD -- cow >actual &&
137114 sed -e "$pick_fc" actual >current &&
138115 cat >expected <<-\EOF &&
@@ -142,11 +119,9 @@ test_expect_success 'blame wholesale copy and more' '
142119 mouse-Third
143120 EOF
144121 test_cmp expected current
145-
146122'
147123
148124test_expect_success ' blame wholesale copy and more in the index' '
149-
150125 cat >horse <<-\EOF &&
151126 ABC
152127 DEF
@@ -166,11 +141,9 @@ test_expect_success 'blame wholesale copy and more in the index' '
166141 mouse-Third
167142 EOF
168143 test_cmp expected current
169-
170144'
171145
172146test_expect_success ' blame during cherry-pick with file rename conflict' '
173-
174147 test_when_finished "git reset --hard && git checkout main" &&
175148 git checkout HEAD~3 &&
176149 echo MOUSE >> mouse &&
0 commit comments