Merge branch 'jc/diffcore-rotate'

[thirdparty/git.git] / t / t4056-diff-order.sh

diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh
index 63ea7144bb492b1c7526c1103afc0f70a33fc8c8..aec1d9d1b42f65f1080f7e054bca70bbffcefcc6 100755 (executable)
--- a/t/t4056-diff-order.sh
+++ b/t/t4056-diff-order.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='diff order'
+test_description='diff order & rotate'
 
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
@@ -127,4 +127,74 @@ do
        '
 done
 
+### rotate and skip
+
+test_expect_success 'rotate and skip setup' '
+       >sample1.t &&
+       >sample2.t &&
+       >sample3.t &&
+       >sample4.t &&
+       git add sample[1234].t &&
+       git commit -m "added" sample[1234].t &&
+       echo modified >>sample1.t &&
+       echo modified >>sample2.t &&
+       echo modified >>sample4.t &&
+       git commit -m "updated" sample[1234].t
+'
+
+test_expect_success 'diff --rotate-to' '
+       git diff --rotate-to=sample2.t --name-only HEAD^ >actual &&
+       test_write_lines sample2.t sample4.t sample1.t >expect &&
+       test_cmp expect actual
+'
+
+test_expect_success 'diff --skip-to' '
+       git diff --skip-to=sample2.t --name-only HEAD^ >actual &&
+       test_write_lines sample2.t sample4.t >expect &&
+       test_cmp expect actual
+'
+
+test_expect_success 'diff --rotate/skip-to error condition' '
+       test_must_fail git diff --rotate-to=sample3.t HEAD^ &&
+       test_must_fail git diff --skip-to=sample3.t HEAD^
+'
+
+test_expect_success 'log --rotate-to' '
+       git log --rotate-to=sample3.t --raw HEAD~2.. >raw &&
+       # just distill the commit header and paths
+       sed -n -e "s/^commit.*/commit/p" \
+              -e "/^:/s/^.*    //p" raw >actual &&
+
+       cat >expect <<-\EOF &&
+       commit
+       sample4.t
+       sample1.t
+       sample2.t
+       commit
+       sample3.t
+       sample4.t
+       sample1.t
+       sample2.t
+       EOF
+
+       test_cmp expect actual
+'
+
+test_expect_success 'log --skip-to' '
+       git log --skip-to=sample3.t --raw HEAD~2.. >raw &&
+       # just distill the commit header and paths
+       sed -n -e "s/^commit.*/commit/p" \
+              -e "/^:/s/^.*    //p" raw >actual &&
+
+       cat >expect <<-\EOF &&
+       commit
+       sample4.t
+       commit
+       sample3.t
+       sample4.t
+       EOF
+
+       test_cmp expect actual
+'
+
 test_done