X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft5541-http-push.sh;h=b0c2a2c3aea811ec023423bdb486de5412fa79c5;hb=452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e;hp=17e1bdc5a81ce4802f5074ddb9c1996c68fc97be;hpb=e1165dd1442017c2b2722027168c497640f25746;p=git.git diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh index 17e1bdc5a..b0c2a2c3a 100755 --- a/t/t5541-http-push.sh +++ b/t/t5541-http-push.sh @@ -7,7 +7,7 @@ test_description='test smart pushing over http via http-backend' . ./test-lib.sh if test -n "$NO_CURL"; then - say 'skipping test, git built without http support' + skip_all='skipping test, git built without http support' test_done fi @@ -128,7 +128,7 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he # push master too; this ensures there is at least one '"'push'"' command to # the remote helper and triggers interaction with the helper. - !(git push -v origin +master master:retsam >output 2>&1) && + test_must_fail git push -v origin +master master:retsam >output 2>&1 && grep "^ + [a-f0-9]*\.\.\.[a-f0-9]* *master -> master (forced update)$" output && grep "^ ! \[rejected\] *master -> retsam (non-fast-forward)$" output &&