Merge branch 'rs/more-uses-of-skip-prefix'

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 143a8ea60507a35bbdfb310eb74a33cf5b88bf1f..0366653088417a3d694856538bb1d1bd35d36cda 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1385,41 +1385,103 @@ test_expect_success 'lexical sort' '
        git tag foo1.6 &&
        git tag foo1.10 &&
        git tag -l --sort=refname "foo*" >actual &&
-       cat >expect <<EOF &&
-foo1.10
-foo1.3
-foo1.6
-EOF
+       cat >expect <<-\EOF &&
+       foo1.10
+       foo1.3
+       foo1.6
+       EOF
        test_cmp expect actual
 '
 
 test_expect_success 'version sort' '
        git tag -l --sort=version:refname "foo*" >actual &&
-       cat >expect <<EOF &&
-foo1.3
-foo1.6
-foo1.10
-EOF
+       cat >expect <<-\EOF &&
+       foo1.3
+       foo1.6
+       foo1.10
+       EOF
        test_cmp expect actual
 '
 
 test_expect_success 'reverse version sort' '
        git tag -l --sort=-version:refname "foo*" >actual &&
-       cat >expect <<EOF &&
-foo1.10
-foo1.6
-foo1.3
-EOF
+       cat >expect <<-\EOF &&
+       foo1.10
+       foo1.6
+       foo1.3
+       EOF
        test_cmp expect actual
 '
 
 test_expect_success 'reverse lexical sort' '
        git tag -l --sort=-refname "foo*" >actual &&
-       cat >expect <<EOF &&
-foo1.6
-foo1.3
-foo1.10
-EOF
+       cat >expect <<-\EOF &&
+       foo1.6
+       foo1.3
+       foo1.10
+       EOF
+       test_cmp expect actual
+'
+
+test_expect_success 'configured lexical sort' '
+       git config tag.sort "v:refname" &&
+       git tag -l "foo*" >actual &&
+       cat >expect <<-\EOF &&
+       foo1.3
+       foo1.6
+       foo1.10
+       EOF
+       test_cmp expect actual
+'
+
+test_expect_success 'option override configured sort' '
+       git tag -l --sort=-refname "foo*" >actual &&
+       cat >expect <<-\EOF &&
+       foo1.6
+       foo1.3
+       foo1.10
+       EOF
+       test_cmp expect actual
+'
+
+test_expect_success 'invalid sort parameter on command line' '
+       test_must_fail git tag -l --sort=notvalid "foo*" >actual
+'
+
+test_expect_success 'invalid sort parameter in configuratoin' '
+       git config tag.sort "v:notvalid" &&
+       git tag -l "foo*" >actual &&
+       cat >expect <<-\EOF &&
+       foo1.10
+       foo1.3
+       foo1.6
+       EOF
+       test_cmp expect actual
+'
+
+run_with_limited_stack () {
+       (ulimit -s 64 && "$@")
+}
+
+test_lazy_prereq ULIMIT 'run_with_limited_stack true'
+
+# we require ulimit, this excludes Windows
+test_expect_success ULIMIT '--contains works in a deep repo' '
+       >expect &&
+       i=1 &&
+       while test $i -lt 4000
+       do
+               echo "commit refs/heads/master
+committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
+data <<EOF
+commit #$i
+EOF"
+               test $i = 1 && echo "from refs/heads/master^0"
+               i=$(($i + 1))
+       done | git fast-import &&
+       git checkout master &&
+       git tag far-far-away HEAD^ &&
+       run_with_limited_stack git tag --contains HEAD >actual &&
        test_cmp expect actual
 '