diff options
| author | Bert Wesarg <bert.wesarg@googlemail.com> | 2019-10-21 15:23:42 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-23 11:08:58 +0900 |
| commit | 19c29e538e48ed50286339b0fdd5e62111a724db (patch) | |
| tree | 98ab4fa777e62a598f9cd9afc581f63686282a45 | |
| parent | edefc318731f69c3e5354ead9f7505e789562375 (diff) | |
| download | git-19c29e538e48ed50286339b0fdd5e62111a724db.tar.gz | |
t4014: make output-directory tests self-contained
As noted by Gábor in [1], the new tests in edefc31873 ("format-patch:
create leading components of output directory", 2019-10-11) cannot be
run independently. Fix this.
[1] https://public-inbox.org/git/20191011144650.GM29845@szeder.dev/
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t4014-format-patch.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index c455181e1d..93a1656f29 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -1615,17 +1615,20 @@ test_expect_success 'format-patch -o with no leading directories' ' ' test_expect_success 'format-patch -o with leading existing directories' ' - git format-patch -o patches/side master..side && + rm -rf existing-dir && + mkdir existing-dir && + git format-patch -o existing-dir/patches master..side && count=$(git rev-list --count master..side) && - ls patches/side >list && + ls existing-dir/patches >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 && + rm -rf non-existing-dir && + git format-patch -o non-existing-dir/patches master..side && count=$(git rev-list --count master..side) && - ls patches/side >list && + test_path_is_dir non-existing-dir && + ls non-existing-dir/patches >list && test_line_count = $count list ' |