cvsserver status: provide real sticky info

diff --git a/t/t9805-git-p4-skip-submit-edit.sh b/t/t9805-git-p4-skip-submit-edit.sh
index 353dcfbe09fec2c2a85427e3e5cb378b9a8318d8..ff2cc79701cce5ff570ff3c11d1ad0b60459d9ef 100755 (executable)
--- a/t/t9805-git-p4-skip-submit-edit.sh
+++ b/t/t9805-git-p4-skip-submit-edit.sh
@@ -38,7 +38,7 @@ test_expect_success 'no config, unedited, say no' '
                cd "$git" &&
                echo line >>file1 &&
                git commit -a -m "change 3 (not really)" &&
-               printf "bad response\nn\n" | git p4 submit &&
+               printf "bad response\nn\n" | test_expect_code 1 git p4 submit &&
                p4 changes //depot/... >wc &&
                test_line_count = 2 wc
        )
@@ -78,20 +78,19 @@ test_expect_success 'skipSubmitEditCheck' '
 test_expect_success 'no config, edited' '
        git p4 clone --dest="$git" //depot &&
        test_when_finished cleanup_git &&
-       ed="$TRASH_DIRECTORY/ed.sh" &&
-       test_when_finished "rm \"$ed\"" &&
-       cat >"$ed" <<-EOF &&
+       test_when_finished "rm ed.sh" &&
+       cat >ed.sh <<-EOF &&
                #!$SHELL_PATH
                sleep 1
                touch "\$1"
                exit 0
        EOF
-       chmod 755 "$ed" &&
+       chmod 755 ed.sh &&
        (
                cd "$git" &&
                echo line >>file1 &&
                git commit -a -m "change 5" &&
-               P4EDITOR="" EDITOR="\"$ed\"" git p4 submit &&
+               P4EDITOR="" EDITOR="\"$TRASH_DIRECTORY/ed.sh\"" git p4 submit &&
                p4 changes //depot/... >wc &&
                test_line_count = 5 wc
        )