Merge branch 'sb/maint-1.6.0-add-config-fix' into maint

[git.git] / t / t8003-blame.sh

diff --git a/t/t8003-blame.sh b/t/t8003-blame.sh
index db51b3a6bb85c466781139fd1f203b8f9b965710..13c25f1d528ca1ec90575e42e0393accff5d8f35 100755 (executable)
--- a/t/t8003-blame.sh
+++ b/t/t8003-blame.sh
@@ -112,7 +112,7 @@ test_expect_success 'blame wholesale copy' '
                echo mouse-Second
                echo mouse-Third
        } >expected &&
-       diff -u expected current
+       test_cmp expected current
 
 '
 
@@ -125,8 +125,23 @@ test_expect_success 'blame wholesale copy and more' '
                echo cow-Fifth
                echo mouse-Third
        } >expected &&
-       diff -u expected current
+       test_cmp expected current
 
 '
 
+test_expect_success 'blame path that used to be a directory' '
+       mkdir path &&
+       echo A A A A A >path/file &&
+       echo B B B B B >path/elif &&
+       git add path &&
+       test_tick &&
+       git commit -m "path was a directory" &&
+       rm -fr path &&
+       echo A A A A A >path &&
+       git add path &&
+       test_tick &&
+       git commit -m "path is a regular file" &&
+       git blame HEAD^.. -- path
+'
+
 test_done