git/cache.h, branch v2.14.2

Merge branch 'sb/sha1-file-cleanup' into maint

2017-09-10T08:03:04Z

Code clean-up. * sb/sha1-file-cleanup: sha1_file: make read_info_alternates static

Merge branch 'jk/hashcmp-memcmp' into maint

2017-09-10T08:02:59Z

Code clean-up. * jk/hashcmp-memcmp: hashcmp: use memcmp instead of open-coded loop

Merge branch 'jt/subprocess-handshake' into maint

2017-08-23T21:33:52Z

Code cleanup. * jt/subprocess-handshake: sub-process: refactor handshake to common function Documentation: migrate sub-process docs to header convert: add "status=delayed" to filter process protocol convert: refactor capabilities negotiation convert: move multiple file filter error handling to separate function convert: put the flags field before the flag itself for consistent style t0021: write "OUT " only on success t0021: make debug log file name configurable t0021: keep filter log files on comparison

sha1_file: make read_info_alternates static

2017-08-15T21:39:25Z

read_info_alternates is not used from outside, so let's make it static. We have to declare the function before link_alt_odb_entry instead of moving the code around, link_alt_odb_entry calls read_info_alternates, which in turn calls link_alt_odb_entry. Signed-off-by: Stefan Beller Reviewed-by: Jeff King Signed-off-by: Junio C Hamano

hashcmp: use memcmp instead of open-coded loop

2017-08-09T18:03:25Z

In 1a812f3a70 (hashcmp(): inline memcmp() by hand to optimize, 2011-04-28), it was reported that an open-coded loop outperformed memcmp() for comparing sha1s. Discussion[1] a few years later in 2013 showed that this depends on your libc's version of memcmp(). In particular, glibc 2.13 optimized their memcmp around 2011. Here are current timings with glibc 2.24 (best-of-five, on linux.git): [before this patch, open-coded] $ time git rev-list --objects --all real 0m35.357s user 0m35.016s sys 0m0.340s [after this patch, memcmp] real 0m32.930s user 0m32.630s sys 0m0.300s Now that we've had 6 years for that version of glibc to make its way onto people's machines, it's worth revisiting our benchmarks and switching to memcmp(). It may be that there are other non-glibc systems where memcmp() isn't as well optimized. But since our single data point in favor of open-coding was on a now-ancient glibc, we should probably assume the system memcmp is good unless proven otherwise. We may end up with a SLOW_MEMCMP Makefile knob, but we can hold off on that until we actually find such a system in practice. [1] https://public-inbox.org/git/20130318073229.GA5551@sigill.intra.peff.net/ Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge tag 'v2.13.5' into maint

2017-08-04T19:40:37Z

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