Merge branch 'dl/format-patch-cover-from-desc'

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

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 88db01308a3f09f20c764617d44418172b459cbf..69267b16f0baccc642ed3c7a4692b1a0c415d478 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -1778,6 +1778,32 @@ 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' '
+       rm -rf existing-dir &&
+       mkdir existing-dir &&
+       git format-patch -o existing-dir/patches master..side &&
+       count=$(git rev-list --count master..side) &&
+       ls existing-dir/patches >list &&
+       test_line_count = $count list
+'
+
+test_expect_success 'format-patch -o with leading non-existing directories' '
+       rm -rf non-existing-dir &&
+       git format-patch -o non-existing-dir/patches master..side &&
+       count=$(git rev-list --count master..side) &&
+       test_path_is_dir non-existing-dir &&
+       ls non-existing-dir/patches >list &&
+       test_line_count = $count list
+'
+
 test_expect_success 'format-patch format.outputDirectory option' '
        test_config format.outputDirectory patches &&
        rm -fr patches &&