Merge branch 'sg/t3420-autostash-fix'

diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh
index e7e0268e985072b6a7d8c9448dc0c3d9a9057da9..60baa06e27a0a6c45f580738e60f7fe8fa65373a 100755 (executable)
--- a/t/t9814-git-p4-rename.sh
+++ b/t/t9814-git-p4-rename.sh
@@ -9,23 +9,11 @@ test_expect_success 'start p4d' '
 '
 
 # We rely on this behavior to detect for p4 move availability.
-test_expect_success 'p4 help unknown returns 1' '
+test_expect_success '"p4 help unknown" errors out' '
        (
                cd "$cli" &&
-               (
-                       p4 help client >errs 2>&1
-                       echo $? >retval
-               )
-               echo 0 >expected &&
-               test_cmp expected retval &&
-               rm retval &&
-               (
-                       p4 help nosuchcommand >errs 2>&1
-                       echo $? >retval
-               )
-               echo 1 >expected &&
-               test_cmp expected retval &&
-               rm retval
+               p4 help client &&
+               ! p4 help nosuchcommand
        )
 '