diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-08-10 17:17:52 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-11 10:21:36 -0700 |
| commit | 2caf20c52b7f646d0a7481c25415c48d687773b2 (patch) | |
| tree | 0d6ea01a4b9cff3719c67ceede9b94f303982941 /t/t3407-rebase-abort.sh | |
| parent | cd035b1cef39811fd3116aa07d99395960ec947a (diff) | |
| download | git-2caf20c52b7f646d0a7481c25415c48d687773b2.tar.gz git-2caf20c52b7f646d0a7481c25415c48d687773b2.tar.xz | |
test-lib: user-friendly alternatives to test [-d|-f|-e]
The helper functions are implemented, documented, and used in a few
places to validate them, but not everywhere to avoid useless code churn.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3407-rebase-abort.sh')
| -rwxr-xr-x | t/t3407-rebase-abort.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh index 2999e7893..fbb3f2e0d 100755 --- a/t/t3407-rebase-abort.sh +++ b/t/t3407-rebase-abort.sh @@ -38,7 +38,7 @@ testrebase() { # Clean up the state from the previous one git reset --hard pre-rebase && test_must_fail git rebase$type master && - test -d "$dotest" && + test_path_is_dir "$dotest" && git rebase --abort && test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) && test ! -d "$dotest" @@ -49,7 +49,7 @@ testrebase() { # Clean up the state from the previous one git reset --hard pre-rebase && test_must_fail git rebase$type master && - test -d "$dotest" && + test_path_is_dir "$dotest" && test_must_fail git rebase --skip && test $(git rev-parse HEAD) = $(git rev-parse master) && git rebase --abort && @@ -62,7 +62,7 @@ testrebase() { # Clean up the state from the previous one git reset --hard pre-rebase && test_must_fail git rebase$type master && - test -d "$dotest" && + test_path_is_dir "$dotest" && echo c > a && echo d >> a && git add a && |