Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/t4062-obsd' into maint
author
Junio C Hamano
<gitster@pobox.com>
Sun, 10 Sep 2017 08:02:51 +0000
(17:02 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 10 Sep 2017 08:02:51 +0000
(17:02 +0900)
Test portability fix.
* rs/t4062-obsd:
t4062: use less than 256 repetitions in regex
1
2
t/t4062-diff-pickaxe.sh
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
compact
(merge:
c2e1941
4c7fda8
)
diff --combined
t/t4062-diff-pickaxe.sh
index 7c4903f49713a22d7fba28a608acf07f1330110b,9f3ce4bc693754c7b24c347b606bd1ba5114b96b..1130c8019b4c14975744f31f360886ffb4c3f14c
---
1
/
t/t4062-diff-pickaxe.sh
---
2
/
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