diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2020-01-06 23:53:05 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-01-27 12:56:02 -0800 |
| commit | 245b9ba0ba51a9e19f77a2a96a82a4f021d4a9fc (patch) | |
| tree | 44dacc5d4651813af586714128665cba72ed0325 | |
| parent | t2018: replace "sha" with "oid" (diff) | |
| download | tgif-245b9ba0ba51a9e19f77a2a96a82a4f021d4a9fc.tar.xz | |
t3030: use test_path_is_missing()
We use `test_must_fail test -d` to ensure that the directory is removed.
However, test_must_fail() should only be used for git commands. Use
test_path_is_missing() instead to check that the directory has been
removed.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3030-merge-recursive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index 2170758e38..d48d211a95 100755 --- a/t/t3030-merge-recursive.sh +++ b/t/t3030-merge-recursive.sh @@ -604,7 +604,7 @@ test_expect_success 'merge removes empty directories' ' git commit -mremoved-d/e && git checkout master && git merge -s recursive rm && - test_must_fail test -d d + test_path_is_missing d ' test_expect_success 'merge-recursive simple w/submodule' ' |