diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-03-18 04:55:06 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-03-18 04:55:06 +0300 |
commit | ca8a36e6e0cf6ee952df16160bc853630c56b997 (patch) | |
tree | a7a0cc36a4aac48173264e8d84dbe4ba1dcd7fad /t/t5540-http-push.sh | |
parent | a57ca9dd400c8459a3cd3d769bab317f57d1e9ac (diff) | |
parent | 8321c56b6bae25a2d70790f452df894be536b32c (diff) |
Merge branch 'js/remote-improvements'
* js/remote-improvements: (23 commits)
builtin-remote.c: no "commented out" code, please
builtin-remote: new show output style for push refspecs
builtin-remote: new show output style
remote: make guess_remote_head() use exact HEAD lookup if it is available
builtin-remote: add set-head subcommand
builtin-remote: teach show to display remote HEAD
builtin-remote: fix two inconsistencies in the output of "show <remote>"
builtin-remote: make get_remote_ref_states() always populate states.tracked
builtin-remote: rename variables and eliminate redundant function call
builtin-remote: remove unused code in get_ref_states
builtin-remote: refactor duplicated cleanup code
string-list: new for_each_string_list() function
remote: make match_refs() not short-circuit
remote: make match_refs() copy src ref before assigning to peer_ref
remote: let guess_remote_head() optionally return all matches
remote: make copy_ref() perform a deep copy
remote: simplify guess_remote_head()
move locate_head() to remote.c
move duplicated ref_newer() to remote.c
move duplicated get_local_heads() to remote.c
...
Conflicts:
builtin-clone.c
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" && |