diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:23:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:23:51 -0700 |
| commit | 1efadd79d61b6d89a14ce8dda64c759d73769fcb (patch) | |
| tree | 127f11f42919c58cfc767f6b892b71dbaac7b46d | |
| parent | ee2309dfe2f386a9df7f5aaac4145e4da572bc34 (diff) | |
| parent | 896e700ad92890b59568a52b88e9bd22eec6f9e7 (diff) | |
| download | git-1efadd79d61b6d89a14ce8dda64c759d73769fcb.tar.gz | |
Merge branch 'va/fix-git-p4-tests'
* va/fix-git-p4-tests:
git-p4: t9814: prevent --chain-lint failure
| -rwxr-xr-x | t/t9814-git-p4-rename.sh | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh index 99bb71b89c..c89992cf95 100755 --- a/t/t9814-git-p4-rename.sh +++ b/t/t9814-git-p4-rename.sh @@ -226,14 +226,9 @@ test_expect_success 'detect copies' ' # See if configurables can be set, and in particular if the run.move.allow # variable exists, which allows admins to disable the "p4 move" command. -test_expect_success 'p4 configure command and run.move.allow are available' ' - p4 configure show run.move.allow >out ; retval=$? && - test $retval = 0 && - { - egrep ^run.move.allow: out && - test_set_prereq P4D_HAVE_CONFIGURABLE_RUN_MOVE_ALLOW || - true - } || true +test_lazy_prereq P4D_HAVE_CONFIGURABLE_RUN_MOVE_ALLOW ' + p4 configure show run.move.allow >out && + egrep ^run.move.allow: out ' # If move can be disabled, turn it off and test p4 move handling |