Merge branch 'wb/fsmonitor-bitmap-fix'

[thirdparty/git.git] / t / t4014-format-patch.sh

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 83f52614d32a7a077d9d4070a8652415de869cc7..9facc3a79e9736a4fa25f27586349157cc00737b 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -1606,12 +1606,36 @@ test_expect_success 'From line has expected format' '
        test_cmp from filtered
 '
 
+test_expect_success 'format-patch -o with no leading directories' '
+       rm -fr patches &&
+       git format-patch -o patches master..side &&
+       count=$(git rev-list --count master..side) &&
+       ls patches >list &&
+       test_line_count = $count list
+'
+
+test_expect_success 'format-patch -o with leading existing directories' '
+       git format-patch -o patches/side master..side &&
+       count=$(git rev-list --count master..side) &&
+       ls patches/side >list &&
+       test_line_count = $count list
+'
+
+test_expect_success 'format-patch -o with leading non-existing directories' '
+       rm -fr patches &&
+       git format-patch -o patches/side master..side &&
+       count=$(git rev-list --count master..side) &&
+       ls patches/side >list &&
+       test_line_count = $count list
+'
+
 test_expect_success 'format-patch format.outputDirectory option' '
        test_config format.outputDirectory patches &&
        rm -fr patches &&
        git format-patch master..side &&
-       git rev-list master..side >list &&
-       test_line_count = $(ls patches | wc -l) list
+       count=$(git rev-list --count master..side) &&
+       ls patches >list &&
+       test_line_count = $count list
 '
 
 test_expect_success 'format-patch -o overrides format.outputDirectory' '