Merge branch 'rs/t4062-obsd'

gitster · gitster · commit 2893137b0d96 · 2017-08-22T10:29:13.000-07:00
Test portability fix.

* rs/t4062-obsd:
  t4062: use less than 256 repetitions in regex
diff --git a/t/t4062-diff-pickaxe.sh b/t/t4062-diff-pickaxe.sh
@@ -14,8 +14,10 @@ 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)"
 '
 

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,10 @@ test_expect_success setup '`
`14`	`14`	`test_tick &&`
`15`	`15`	`git commit -m "A 4k file"`
`16`	`16`	`'`
	`17`	`+`
	`18`	`+# OpenBSD only supports up to 255 repetitions, so repeat twice for 64*64=4096.`
`17`	`19`	`test_expect_success '-G matches' '`
`18`		`- git diff --name-only -G "^0{4096}$" HEAD^ >out &&`
	`20`	`+ git diff --name-only -G "^(0{64}){64}$" HEAD^ >out &&`
`19`	`21`	`test 4096-zeroes.txt = "$(cat out)"`
`20`	`22`	`'`
`21`	`23`