From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Oct 2014 17:49:41 +0000 (-0700)
Subject: Merge branch 'sk/tag-contains-wo-recursion'
X-Git-Tag: v2.2.0-rc0~54
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7543dea8b2a33e4a56b0fdd408bc47769238025e?hp=-c

Merge branch 'sk/tag-contains-wo-recursion'

* sk/tag-contains-wo-recursion:
t7004: give the test a bit more stack space
---

7543dea8b2a33e4a56b0fdd408bc47769238025e
diff --combined t/t7004-tag.sh
index 0366653088,c5641975b4..796e9f79ea
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@@ -1385,82 -1385,46 +1385,82 @@@ 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 && "$@")
+ 	(ulimit -s 128 && "$@")
  }
  
  test_lazy_prereq ULIMIT 'run_with_limited_stack true'
@@@ -1469,7 -1433,7 +1469,7 @@@
  test_expect_success ULIMIT '--contains works in a deep repo' '
  	>expect &&
  	i=1 &&
- 	while test $i -lt 4000
+ 	while test $i -lt 8000
  	do
  		echo "commit refs/heads/master
  committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200