git/cache.h, branch v2.13.6

Merge tag 'v2.12.4' into maint

2017-08-01T19:27:31Z

Merge tag 'v2.11.3' into maint-2.12

2017-07-30T22:04:22Z

Git 2.11.3

Merge tag 'v2.10.4' into maint-2.11

2017-07-30T22:01:31Z

Git 2.10.4

Merge tag 'v2.9.5' into maint-2.10

2017-07-30T21:57:33Z

Git 2.9.5

Merge tag 'v2.8.6' into maint-2.9

2017-07-30T21:52:14Z

Git 2.8.6

Merge tag 'v2.7.6' into maint-2.8

2017-07-30T21:46:43Z

Git 2.7.6

connect: factor out "looks like command line option" check

2017-07-28T22:51:56Z

We reject hostnames that start with a dash because they may be confused for command-line options. Let's factor out that notion into a helper function, as we'll use it in more places. And while it's simple now, it's not clear if some systems might need more complex logic to handle all cases. Signed-off-by: Jeff King Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano

get_sha1_with_context: dynamically allocate oc->path

2017-05-24T01:59:27Z

When a sha1 lookup returns the tree path via "struct object_context", it just copies it into a fixed-size buffer. This means the result can be truncated, and it means our "struct object_context" consumes a lot of stack space. Instead, let's allocate a string on the heap. Because most callers don't care about this information, we'll avoid doing it by default (so they don't all have to start calling free() on the result). There are basically two options for the caller to signal to us that it's interested: 1. By setting a pointer to storage in the object_context. 2. By passing a flag in another parameter. Doing (1) would match the way that sha1_object_info_extended() works. But it would mean that every caller would have to initialize the object_context, which they don't currently have to do. This patch does (2), and adds a new bit to the function's flags field. All of the callers that look at the "path" field are updated to pass the new flag. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

sha1_name: consistently refer to object_context as "oc"

2017-05-24T01:59:27Z

An early version of the patch to add object_context used the name object_resolve_context. This was later shortened to just object_context, but the "orc" variable name stuck in a few places. Let's use "oc", which is used elsewhere in the code. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'jh/add-index-entry-optim'

2017-04-26T06:39:07Z

"git checkout" that handles a lot of paths has been optimized by reducing the number of unnecessary checks of paths in the has_dir_name() function. * jh/add-index-entry-optim: read-cache: speed up has_dir_name (part 2) read-cache: speed up has_dir_name (part 1) read-cache: speed up add_index_entry during checkout p0006-read-tree-checkout: perf test to time read-tree read-cache: add strcmp_offset function