From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Sep 2017 08:02:51 +0000 (+0900)
Subject: Merge branch 'rs/t4062-obsd' into maint
X-Git-Tag: v2.14.2~35
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b3a19e060cdc81b83ab9f10dc5817deff858e0a6?hp=-c

Merge branch 'rs/t4062-obsd' into maint

Test portability fix.

* rs/t4062-obsd:
t4062: use less than 256 repetitions in regex
---

b3a19e060cdc81b83ab9f10dc5817deff858e0a6
diff --combined t/t4062-diff-pickaxe.sh
index 7c4903f497,9f3ce4bc69..1130c8019b
--- a/t/t4062-diff-pickaxe.sh
+++ b/t/t4062-diff-pickaxe.sh
@@@ -14,14 -14,11 +14,16 @@@ test_expect_success setup 
  	test_tick &&
  	git commit -m "A 4k file"
  '
+ 
+ # OpenBSD only supports up to 255 repetitions, so repeat twice for 64*64=4096.
  test_expect_success '-G matches' '
- 	git diff --name-only -G "^0{4096}$" HEAD^ >out &&
+ 	git diff --name-only -G "^(0{64}){64}$" HEAD^ >out &&
  	test 4096-zeroes.txt = "$(cat out)"
  '
  
 +test_expect_success '-S --pickaxe-regex' '
 +	git diff --name-only -S0 --pickaxe-regex HEAD^ >out &&
 +	verbose test 4096-zeroes.txt = "$(cat out)"
 +'
 +
  test_done