git/http-push.c, branch v1.6.2

Merge branch 'rc/http-push'

2009-02-15T09:43:57Z

* rc/http-push: use a hash of the lock token as the suffix for PUT/MOVE

use a hash of the lock token as the suffix for PUT/MOVE

2009-02-15T08:57:43Z

After 753bc91 ("Remove the requirement opaquelocktoken uri scheme"), lock tokens are in the URI forms in which they are received from the server, eg. 'opaquelocktoken:', 'urn:uuid:'. However, "start_put" (and consequently "start_move"), which attempts to create a unique temporary file using the UUID of the lock token, inadvertently uses the lock token in its URI form. These file operations on the server may not be successful (specifically, in Windows), due to the colon ':' character from the URI form of the lock token in the file path. This patch uses a hash of the lock token instead, guaranteeing only "safe" characters (a-f, 0-9) are used in the file path. The token's hash is generated when the lock token is received from the server in handle_new_lock_ctx, minimizing the number of times of hashing. Signed-off-by: Tay Ray Chuan Signed-off-by: Junio C Hamano

Merge branch 'rc/http-push'

2009-02-06T03:40:36Z

* rc/http-push: http-push: wrap signature of get_remote_object_url http-push: add back underscore separator before lock token http-push.c: get_remote_object_url() is only used under USE_CURL_MULTI http-push: refactor request url creation

http-push: wrap signature of get_remote_object_url

2009-02-04T06:51:48Z

The signature of get_remote_object_url stands at 96 characters (as pointed out by Dscho); this patch wraps it so that it conforms to the 80 characters guideline. Signed-off-by: Junio C Hamano

http-push: add back underscore separator before lock token

2009-02-04T06:16:24Z

817d14a (http-push: refactor request url creation, 2009-01-31) removed the underscore separator between the object path and the appended lock token. This patch adds it back. This would be keeping in line with the aforementioned patch's objective of refactoring, without changing the behaviour and effect, of the code. This would also be useful for testing if the lock token has been indeed appended to the object url. Signed-off-by: Tay Ray Chuan Signed-off-by: Junio C Hamano

http-push.c: get_remote_object_url() is only used under USE_CURL_MULTI

2009-02-03T06:44:41Z

Otherwise -Wunused-function (which is implied by -Wall) triggers. Signed-off-by: Junio C Hamano

Merge branch 'sp/runtime-prefix'

2009-02-01T01:43:59Z

* sp/runtime-prefix: Windows: Revert to default paths and convert them by RUNTIME_PREFIX Compute prefix at runtime if RUNTIME_PREFIX is set Modify setup_path() to only add git_exec_path() to PATH Add calls to git_extract_argv0_path() in programs that call git_config_* git_extract_argv0_path(): Move check for valid argv0 from caller to callee Refactor git_set_argv0_path() to git_extract_argv0_path() Move computation of absolute paths from Makefile to runtime (in preparation for RUNTIME_PREFIX)

Merge branch 'jk/signal-cleanup'

2009-02-01T01:43:56Z

* jk/signal-cleanup: t0005: use SIGTERM for sigchain test pager: do wait_for_pager on signal death refactor signal handling for cleanup functions chain kill signals for cleanup functions diff: refactor tempfile cleanup handling Windows: Fix signal numbers

http-push: refactor request url creation

2009-02-01T01:10:07Z

Introduce two helper functions append_remote_object_url() and get_remote_object_url() and use them to remove various places that allocate and format the URL by hand. These functions generate a URL that point at the fan-out directory inside the remote object store (e.g. http://host/path/to/repo/objects/a1/) or at an individual loose object file. Signed-off-by: Tay Ray Chuan Signed-off-by: Junio C Hamano

Add calls to git_extract_argv0_path() in programs that call git_config_*

2009-01-26T08:26:05Z

Programs that use git_config need to find the global configuration. When runtime prefix computation is enabled, this requires that git_extract_argv0_path() is called early in the program's main(). This commit adds the necessary calls. Signed-off-by: Steffen Prohaska Acked-by: Johannes Sixt Signed-off-by: Junio C Hamano