From 6dbf0c7bebd1c71c44d786ebac0f2b3f226a0131 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 13 Aug 2020 01:23:05 -0400 Subject: 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 Signed-off-by: Junio C Hamano --- t/t8003-blame-corner-cases.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 't') diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh index 9130b887d2..7f0d4f7a96 100755 --- a/t/t8003-blame-corner-cases.sh +++ b/t/t8003-blame-corner-cases.sh @@ -274,10 +274,6 @@ test_expect_success 'blame file with CRLF core.autocrlf=true' ' grep "A U Thor" actual ' -# Tests the splitting and merging of blame entries in blame_coalesce(). -# The output of blame is the same, regardless of whether blame_coalesce() runs -# or not, so we'd likely only notice a problem if blame crashes or assigned -# blame to the "splitting" commit ('SPLIT' below). test_expect_success 'blame coalesce' ' cat >giraffe <<-\EOF && ABC @@ -303,10 +299,11 @@ test_expect_success 'blame coalesce' ' git commit -m "same contents as original" && cat >expect <<-EOF && - $oid 1) ABC - $oid 2) DEF + $oid 1 1 2 + $oid 2 2 EOF - git -c core.abbrev=40 blame -s giraffe >actual && + git blame --porcelain giraffe >actual.raw && + grep "^$oid" actual.raw >actual && test_cmp expect actual ' -- cgit v1.2.3 From dd7c6111647ecae2315b4f0ca039b92d32e0cadc Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 13 Aug 2020 01:23:41 -0400 Subject: t8003: factor setup out of coalesce test In preparation for adding more tests of blame's coalesce code, let's split the setup out from the first test, and give each of the commits a more meaningful name: - $orig for the original source that added the lines - $split for the version where they are split apart - $final for the final version that re-joins them That's not strictly necessary, but makes the follow-on tests less brittle than relying on HEAD^, etc, to name the commits. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/t8003-blame-corner-cases.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 't') diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh index 7f0d4f7a96..383ba2bbd6 100755 --- a/t/t8003-blame-corner-cases.sh +++ b/t/t8003-blame-corner-cases.sh @@ -274,14 +274,14 @@ test_expect_success 'blame file with CRLF core.autocrlf=true' ' grep "A U Thor" actual ' -test_expect_success 'blame coalesce' ' +test_expect_success 'setup coalesce tests' ' cat >giraffe <<-\EOF && ABC DEF EOF git add giraffe && git commit -m "original file" && - oid=$(git rev-parse HEAD) && + orig=$(git rev-parse HEAD) && cat >giraffe <<-\EOF && ABC @@ -290,6 +290,7 @@ test_expect_success 'blame coalesce' ' EOF git add giraffe && git commit -m "interior SPLIT line" && + split=$(git rev-parse HEAD) && cat >giraffe <<-\EOF && ABC @@ -297,13 +298,16 @@ test_expect_success 'blame coalesce' ' EOF git add giraffe && git commit -m "same contents as original" && + final=$(git rev-parse HEAD) +' +test_expect_success 'blame coalesce' ' cat >expect <<-EOF && - $oid 1 1 2 - $oid 2 2 + $orig 1 1 2 + $orig 2 2 EOF - git blame --porcelain giraffe >actual.raw && - grep "^$oid" actual.raw >actual && + git blame --porcelain $final giraffe >actual.raw && + grep "^$orig" actual.raw >actual && test_cmp expect actual ' -- cgit v1.2.3 From c2ebaa27d63bfb7c50cbbdaba90aee4efdd45d0a Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 13 Aug 2020 01:25:31 -0400 Subject: blame: only coalesce lines that are adjacent in result After blame has finished but before we produce any output, we coalesce groups of lines that were adjacent in the original suspect (which may have been split apart by lines in intermediate commits which went away). However, this can cause incorrect output if the lines are not also adjacent in the result. For instance, the case in t8003 has: ABC DEF which becomes ABC SPLIT DEF Blaming only lines 1 and 3 in the result yields two blame groups (one for each line) that were adjacent in the original. That's enough for us to coalesce them into a single group, but that loses information: our output routines assume they're adjacent in the result as well, and we output: 1) ABC 2) SPLIT This is nonsense for two reasons: - we were asked about line 3, not line 2; we should not output the SPLIT line at all - commit did not touch the SPLIT line at all! We found the correct blame for line 3, but the bug is actually in the output stage, which is showing the wrong line number and content from the final file. We can fix this by only coalescing when both the suspect and result lines are adjacent. That fixes this bug, but keeps coalescing in cases where want it (e.g., the existing test in t8003 where SPLIT goes away, and the lines really are adjacent in the result). Reported-by: Nuthan Munaiah Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/t8003-blame-corner-cases.sh | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 't') diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh index 383ba2bbd6..a3f12e3d16 100755 --- a/t/t8003-blame-corner-cases.sh +++ b/t/t8003-blame-corner-cases.sh @@ -311,4 +311,13 @@ test_expect_success 'blame coalesce' ' test_cmp expect actual ' +test_expect_success 'blame does not coalesce non-adjacent result lines' ' + cat >expect <<-EOF && + $orig 1) ABC + $orig 3) DEF + EOF + git blame --no-abbrev -s -L1,1 -L3,3 $split giraffe >actual && + test_cmp expect actual +' + test_done -- cgit v1.2.3