t8003: check output of coalesced blame

Commit f0cbe742f4 (blame: add a test to cover blame_coalesce(), 2019-06-20) added a test case where blame can usefully coalesce two groups of lines. But since it relies on the normal blame output, it only exercises the code and can't tell whether the lines were actually joined into a single group. However, by using --porcelain output, we can see how git-blame considers the groupings (and likewise how the coalescing might have a real user-visible impact for a tool that uses the porcelain-output groupings). This lets us confirm that we are indeed coalescing correctly (and the fact that this test case requires coalescing can be verified by dropping the call to blame_coalesce(), causing the test to fail). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Aug 13, 2020 at 01:23 UTC 6dbf0c7bebd1c71c44d786ebac0f2b3f226a0131

1 file changed +4 -7

t/t8003-blame-corner-cases.sh

+4 -7

@@ -274,10 +274,6 @@ test_expect_success 'blame file with CRLF core.autocrlf=true' '

274 grep "A U Thor" actual

275 '

276

277 -# Tests the splitting and merging of blame entries in blame_coalesce().

278 -# The output of blame is the same, regardless of whether blame_coalesce() runs

279 -# or not, so we'd likely only notice a problem if blame crashes or assigned

280 -# blame to the "splitting" commit ('SPLIT' below).

277 test_expect_success 'blame coalesce' '

278 cat >giraffe <<-\EOF &&

279 ABC

@@ -303,10 +299,11 @@ test_expect_success 'blame coalesce' '

299 git commit -m "same contents as original" &&

300

301 cat >expect <<-EOF &&

306 - $oid 1) ABC

307 - $oid 2) DEF

302 + $oid 1 1 2

303 + $oid 2 2

304 EOF

309 - git -c core.abbrev=40 blame -s giraffe >actual &&

305 + git blame --porcelain giraffe >actual.raw &&

306 + grep "^$oid" actual.raw >actual &&

307 test_cmp expect actual

308 '

309