diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-05-15 19:26:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-05-16 09:14:21 -0700 |
| commit | eab648d2b4c1ca6fbc28de454b51d7d00f5a3e60 (patch) | |
| tree | 9874fd965c7d5368720fafc524e6d9f3b4f67029 | |
| parent | c205923649568dee9c543d5b7f040d2c660a2272 (diff) | |
| download | git-eab648d2b4c1ca6fbc28de454b51d7d00f5a3e60.tar.gz | |
t2021: do not negate test_path_is_dir
In this test, a path (some_dir) that is originally a directory is to
be removed and then to be replaced with a file of the same name.
The expectation is that the path becomes a file at the end.
However, "! test_path_is_dir some_dir" is used to catch a breakage
that leaves the path as a directory.
But as with all the "test_path_is..." helpers, this use of the
helper makes it loud when the expectation (i.e. it is a directory)
is met, and otherwise is silent when it is not---this does not help
debugging.
Be more explicit and state that we expect the path to become a file.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t2021-checkout-overwrite.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t2021-checkout-overwrite.sh b/t/t2021-checkout-overwrite.sh index 034f62c13c..ecfacf0f7f 100755 --- a/t/t2021-checkout-overwrite.sh +++ b/t/t2021-checkout-overwrite.sh @@ -77,7 +77,7 @@ test_expect_success 'checkout --overwrite-ignore should succeed if only ignored echo autogenerated information >some_dir/ignore && echo ignore >.git/info/exclude && git checkout --overwrite-ignore df_conflict && - ! test_path_is_dir some_dir + test_path_is_file some_dir ' test_done |