git/http-push.c, branch v2.4.9

Merge branch 'sb/leaks'

2015-03-27T20:02:32Z

* sb/leaks: http: release the memory of a http pack request as well read-cache: fix memleak add_to_index(): free unused cache-entry commit.c: fix a memory leak http-push: remove unneeded cleanup merge-recursive: fix memleaks merge-blobs.c: fix a memleak builtin/apply.c: fix a memleak update-index: fix a memleak read-cache: free cache entry in add_to_index in case of early return

http-push: remove unneeded cleanup

2015-03-23T18:12:58Z

preq is NULL as the condition the line before dictates. And the cleanup function release_http_pack_request is not null pointer safe. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

Merge branch 'rs/deflate-init-cleanup'

2015-03-17T23:01:26Z

Code simplification. * rs/deflate-init-cleanup: zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}

zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}

2015-03-05T23:46:03Z

Clear the git_zstream variable at the start of git_deflate_init() etc. so that callers don't have to do that. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

http-push: trim trailing newline from remote symref

2015-01-14T18:28:02Z

When we fetch a symbolic ref file from the remote, we get the whole string "ref: refs/heads/master\n", recognize it by skipping past the "ref: ", and store the rest. We should chomp the trailing newline. This bug was introduced in ae021d8 (use skip_prefix to avoid magic numbers, 2014-06-18), which did not notice that the length computation fed to xmemdupz was quietly tweaked by 1 to account for this. We can solve it by explicitly trimming the newline, which is more obvious. Note that we use strbuf_rtrim here, which will actually cut off any trailing whitespace, not just a single newline. This is a good thing, though, as it makes our parsing more liberal (and spaces are not valid in refnames anyway). Signed-off-by: Jeff King Tested-by: Kyle J. McKay Signed-off-by: Junio C Hamano

Merge branch 'ah/fix-http-push' into maint

2014-07-22T17:29:07Z

* ah/fix-http-push: http-push.c: make CURLOPT_IOCTLDATA a usable pointer

Merge branch 'ah/fix-http-push'

2014-07-16T18:33:11Z

An ancient rewrite passed a wrong pointer to a curl library function in a rarely used code path. * ah/fix-http-push: http-push.c: make CURLOPT_IOCTLDATA a usable pointer

http-push.c: make CURLOPT_IOCTLDATA a usable pointer

2014-07-14T00:57:59Z

Fixes a small bug affecting push to remotes which use some sort of multi-pass authentication. In particular the bug affected SabreDAV as configured by Box.com [1]. It must be a weird server configuration for the bug to have survived this long. Someone should write a test for it. [1] http://marc.info/?l=git&m=140460482604482 Signed-off-by: Abbaad Haider Reviewed-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'jk/xstrfmt'

2014-07-09T18:34:05Z

* jk/xstrfmt: setup_git_env(): introduce git_path_from_env() helper unique_path: fix unlikely heap overflow walker_fetch: fix minor memory leak merge: use argv_array when spawning merge strategy sequencer: use argv_array_pushf setup_git_env: use git_pathdup instead of xmalloc + sprintf use xstrfmt to replace xmalloc + strcpy/strcat use xstrfmt to replace xmalloc + sprintf use xstrdup instead of xmalloc + strcpy use xstrfmt in favor of manual size calculations strbuf: add xstrfmt helper

http-push: refactor parsing of remote object names

2014-06-20T17:45:19Z

We get loose object names like "objects/??/..." from the remote side, and need to convert them to their hex representation. The code to do so is rather hard to follow, as it uses some calculated lengths whose origins are hard to understand and verify (e.g., the path must be exactly 49 characters long. why? Why doesn't the strcpy overflow obj_hex, which is the same length as path?). We can simplify this a bit by using skip_prefix, using standard 40- and 20-character buffers for hex and binary sha1s, and adding some comments. We also drop a totally bogus comment that claims strlcpy cannot be used because "path" is not NUL-terminated. Right between a call to strlen(path) and strcpy(path). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano