X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=t%2Ft6032-merge-large-rename.sh;h=94f010be8a17b8aaa8099d1a54ad2bd4317b67dc;hb=524ee675a36961c5b59302e84ffd08808f4f787e;hp=fdb6c253718e3d4c8acfcd1fc197607aac04b4c4;hpb=6fee20df5c0f233415790cae4accf386fee67923;p=git.git diff --git a/t/t6032-merge-large-rename.sh b/t/t6032-merge-large-rename.sh index fdb6c2537..94f010be8 100755 --- a/t/t6032-merge-large-rename.sh +++ b/t/t6032-merge-large-rename.sh @@ -95,7 +95,7 @@ test_expect_success 'setup large simple rename' ' ' test_expect_success 'massive simple rename does not spam added files' ' - unset GIT_MERGE_VERBOSITY && + sane_unset GIT_MERGE_VERBOSITY && git merge --no-stat simple-rename | grep -v Removing >output && test 5 -gt "$(wc -l < output)" '