git, branch v1.6.5.1

GIT 1.6.5.1

2009-10-17T06:57:19Z

Signed-off-by: Junio C Hamano

Merge branch 'maint-1.6.4' into maint

2009-10-17T06:47:58Z

* maint-1.6.4: grep: do not segfault when -f is used

grep: do not segfault when -f is used

2009-10-17T06:47:47Z

"git grep" would segfault if its -f option was used because it would try to use an uninitialized strbuf, so initialize the strbuf. Thanks to Johannes Sixt for the help with the test cases. Signed-off-by: Matt Kraai Signed-off-by: Junio C Hamano

sha1_file: Fix infinite loop when pack is corrupted

2009-10-14T20:39:37Z

Some types of corruption to a pack may confuse the deflate stream which stores an object. In Andy's reported case a 36 byte region of the pack was overwritten, leading to what appeared to be a valid deflate stream that was trying to produce a result larger than our allocated output buffer could accept. Z_BUF_ERROR is returned from inflate() if either the input buffer needs more input bytes, or the output buffer has run out of space. Previously we only considered the former case, as it meant we needed to move the stream's input buffer to the next window in the pack. We now abort the loop if inflate() returns Z_BUF_ERROR without consuming the entire input buffer it was given, or has filled the entire output buffer but has not yet returned Z_STREAM_END. Either state is a clear indicator that this loop is not working as expected, and should not continue. This problem cannot occur with loose objects as we open the entire loose object as a single buffer and treat Z_BUF_ERROR as an error. Reported-by: Andy Isaacson Signed-off-by: Shawn O. Pearce Acked-by: Nicolas Pitre Signed-off-by: Junio C Hamano

change throughput display units with fast links

2009-10-14T08:19:29Z

Switch to MiB/s when the connection is fast enough (i.e. on a LAN). Signed-off-by: Nicolas Pitre Signed-off-by: Junio C Hamano

clone: Supply the right commit hash to post-checkout when -b is used

2009-10-14T08:19:15Z

When we use -b , we may checkout something else than what the remote's HEAD references, but we still used remote_head to supply the new ref value to the post-checkout hook, which is wrong. So instead of using remote_head to find the value to be passed to the post-checkout hook, we have to use our_head_points_at, which is always correctly setup, even if -b is not used. This also fixes a segfault when "clone -b " is used with a remote repo that doesn't have a valid HEAD, as in such a case remote_head is NULL, but we still tried to access it. Reported-by: Devin Cofer Signed-off-by: Björn Steinbrink Acked-by: Jeff King Signed-off-by: Junio C Hamano

remote-curl: add missing initialization of argv0_path

2009-10-14T06:24:58Z

All programs, in particular also the stand-alone programs (non-builtins) must call git_extract_argv0_path(argv[0]) in order to help builds that derive the installation prefix at runtime, such as the MinGW build. Without this call, the program segfaults (or raises an assertion failure). Signed-off-by: Johannes Sixt Tested-by: Michael Wookey Signed-off-by: Junio C Hamano

Merge branch 'maint-1.6.4' into maint

2009-10-13T08:01:04Z

* maint-1.6.4: git-stash documentation: mention default options for 'list'

git-stash documentation: mention default options for 'list'

2009-10-12T23:16:36Z

Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano

GIT 1.6.5

2009-10-10T07:05:19Z

Signed-off-by: Junio C Hamano