Merge branch 'rs/no-no-no-parseopt'

[git.git] / t / t4150-am.sh

diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 8807b602a51c58cd6fcc313441a0cc7339fc487c..6f77fffee60b5e37140dc8952c95144035ed457a 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
 '
 
@@ -505,4 +505,14 @@ test_expect_success 'am -q is quiet' '
        ! test -s output.out
 '
 
+test_expect_success 'am empty-file does not infloop' '
+       rm -fr .git/rebase-apply &&
+       git reset --hard &&
+       touch empty-file &&
+       test_tick &&
+       { git am empty-file > actual 2>&1 && false || :; } &&
+       echo Patch format detection failed. >expected &&
+       test_cmp expected actual
+'
+
 test_done