Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git on Mac OS and precomposed unicode
[gitweb.git]
/
t
/
t6032-merge-large-rename.sh
diff --git
a/t/t6032-merge-large-rename.sh
b/t/t6032-merge-large-rename.sh
index 94f010be8a17b8aaa8099d1a54ad2bd4317b67dc..15beecc3c6391fea89ffd5f0b6a091f19f9fce19 100755
(executable)
--- a/
t/t6032-merge-large-rename.sh
+++ b/
t/t6032-merge-large-rename.sh
@@
-97,7
+97,7
@@
test_expect_success 'setup large simple rename' '
test_expect_success 'massive simple rename does not spam added files' '
sane_unset GIT_MERGE_VERBOSITY &&
git merge --no-stat simple-rename | grep -v Removing >output &&
- test
5 -gt "$(wc -l < output)"
+ test
_line_count -lt 5 output
'
test_done