Merge branch 'jc/add-i-use-builtin-experimental'

[thirdparty/git.git] / t / t8003-blame-corner-cases.sh

diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
index 7f0d4f7a9678d186bc4a39ab39b2d6272f81d3c9..ba8013b00285afd7f43e7090284e52fa8921224d 100755 (executable)
--- a/t/t8003-blame-corner-cases.sh
+++ b/t/t8003-blame-corner-cases.sh
@@ -6,7 +6,6 @@ test_description='git blame corner cases'
 pick_fc='s/^[0-9a-f^]* *\([^ ]*\) *(\([^ ]*\) .*/\1-\2/'
 
 test_expect_success setup '
-
        echo A A A A A >one &&
        echo B B B B B >two &&
        echo C C C C C >tres &&
@@ -274,14 +273,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 +289,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 +297,25 @@ 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 &&
+       $orig 1 1 2
+       $orig 2 2
+       EOF
+       git blame --porcelain $final giraffe >actual.raw &&
+       grep "^$orig" actual.raw >actual &&
+       test_cmp expect actual
+'
 
+test_expect_success 'blame does not coalesce non-adjacent result lines' '
        cat >expect <<-EOF &&
-       $oid 1 1 2
-       $oid 2 2
+       $orig 1) ABC
+       $orig 3) DEF
        EOF
-       git blame --porcelain giraffe >actual.raw &&
-       grep "^$oid" actual.raw >actual &&
+       git blame --no-abbrev -s -L1,1 -L3,3 $split giraffe >actual &&
        test_cmp expect actual
 '