summaryrefslogtreecommitdiff
path: root/t/t6032-merge-large-rename.sh
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2012-02-12 01:05:12 +0000
committerJunio C Hamano <gitster@pobox.com>2012-02-13 02:29:15 -0800
commit1f5ad6b1a7538d6d489ba97c46455efc0bc3266e (patch)
tree3b376756d870082aab40984fb6e80bc674eb4888 /t/t6032-merge-large-rename.sh
parentd24fbca7a5dcce2eb5e41266dd1be111b47a730c (diff)
downloadgit-1f5ad6b1a7538d6d489ba97c46455efc0bc3266e.tar.gz
t: use sane_unset instead of unset
Change several tests to use the sane_unset function introduced in v1.7.3.1-35-g00648ba instead of the built-in unset function. This fixes a failure I was having on t9130-git-svn-authors-file.sh on Solaris, and prevents several other issues from occurring. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6032-merge-large-rename.sh')
-rwxr-xr-xt/t6032-merge-large-rename.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6032-merge-large-rename.sh b/t/t6032-merge-large-rename.sh
index fdb6c25371..94f010be8a 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)"
'