diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-03-08 00:12:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-08 00:24:21 -0800 |
| commit | 5ad6b0252b4fff02ac8516b2ea5e3e7330dcc76f (patch) | |
| tree | b230fb2d94d62b157fd5b2d5394d17578d8a8a8f /t/t5540-http-push.sh | |
| parent | Support '*' in the middle of a refspec (diff) | |
| parent | builtin-remote.c: no "commented out" code, please (diff) | |
| download | tgif-5ad6b0252b4fff02ac8516b2ea5e3e7330dcc76f.tar.xz | |
Adjust js/remote-improvements and db/refspec-wildcard-in-the-middle
The latter topic changes the definition of how refspec's src and dst side
is stored in-core; it used to be that the asterisk for pattern was
omitted, but now it is included. The former topic handcrafts an old style
refspec to feed the refspec matching machinery that lacks the asterisk and
triggers an error.
This resolves the semantic clash between the two topics early before they
need to be merged to integration branches.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5540-http-push.sh')
| -rwxr-xr-x | t/t5540-http-push.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh index 10e5fd0d5a..c46592f03d 100755 --- a/t/t5540-http-push.sh +++ b/t/t5540-http-push.sh @@ -11,6 +11,7 @@ This test runs various sanity checks on http-push.' ROOT_PATH="$PWD" LIB_HTTPD_DAV=t +LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5540'} if git http-push > /dev/null 2>&1 || [ $? -eq 128 ] then @@ -20,13 +21,7 @@ then fi . "$TEST_DIRECTORY"/lib-httpd.sh - -if ! start_httpd >&3 2>&4 -then - say "skipping test, web server setup failed" - test_done - exit -fi +start_httpd test_expect_success 'setup remote repository' ' cd "$ROOT_PATH" && |