Merge branch 'cb/maint-t5541-make-server-port-portable'

diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 8807b602a51c58cd6fcc313441a0cc7339fc487c..f1b60b8560ce1b27497d9e0e08af007159e04d1d 100755 (executable)
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -136,7 +136,7 @@ test_expect_success setup '
        git format-patch -M --stdout lorem^ >rename-add.patch &&
 
        # reset time
-       unset test_tick &&
+       sane_unset test_tick &&
        test_tick
 '