git/git-compat-util.h, branch v2.0.2

Merge branch 'ym/fix-opportunistic-index-update-race' into maint

2014-06-25T18:49:48Z

"git status", even though it is a read-only operation, tries to update the index with refreshed lstat(2) info to optimize future accesses to the working tree opportunistically, but this could race with a "read-write" operation that modify the index while it is running. Detect such a race and avoid overwriting the index. * ym/fix-opportunistic-index-update-race: read-cache.c: verify index file before we opportunistically update it wrapper.c: add xpread() similar to xread()

wrapper.c: add xpread() similar to xread()

2014-04-10T19:18:55Z

It is a common mistake to call read(2)/pread(2) and forget to anticipate that they may return error with EAGAIN/EINTR when the system call is interrupted. We have xread() helper to relieve callers of read(2) from having to worry about it; add xpread() helper to do the same for pread(2). Update the caller in the builtin/index-pack.c and the mmap emulation in compat/. Signed-off-by: Yiannis Marangos Signed-off-by: Junio C Hamano

Merge branch 'jk/commit-dates-parsing-fix'

2014-04-08T18:59:06Z

Finishing touches for portability. * jk/commit-dates-parsing-fix: t4212: loosen far-in-future test for AIX date: recognize bogus FreeBSD gmtime output

Merge branch 'nd/gc-aggressive'

2014-04-03T19:38:47Z

Allow tweaking the maximum length of the delta-chain produced by "gc --aggressive". * nd/gc-aggressive: environment.c: fix constness for odb_pack_keep() gc --aggressive: make --depth configurable

date: recognize bogus FreeBSD gmtime output

2014-04-01T21:39:04Z

Most gmtime implementations return a NULL value when they encounter an error (and this behavior is specified by ANSI C and POSIX). FreeBSD's implementation, however, will simply leave the "struct tm" untouched. Let's also recognize this and convert it to a NULL (with this patch, t4212 should pass on FreeBSD). Reported-by: René Scharfe Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

environment.c: fix constness for odb_pack_keep()

2014-03-31T17:31:43Z

Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Merge branch 'dk/skip-prefix-scan-only-once'

2014-03-21T19:47:41Z

Update implementation of skip_prefix() to scan only once; given that most "prefix" arguments to the inline function are constant strings whose strlen() can be determined at the compile time, this might actually make things worse with a compiler with sufficient intelligence. * dk/skip-prefix-scan-only-once: skip_prefix(): scan prefix only once

Merge branch 'nd/no-more-fnmatch'

2014-03-14T21:25:31Z

We started using wildmatch() in place of fnmatch(3); complete the process and stop using fnmatch(3). * nd/no-more-fnmatch: actually remove compat fnmatch source code stop using fnmatch (either native or compat) Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch" use wildmatch() directly without fnmatch() wrapper

Merge branch 'cc/starts-n-ends-with-endgame'

2014-03-07T23:18:28Z

prefixcmp/suffixcmp are gone.

skip_prefix(): scan prefix only once

2014-03-03T23:38:14Z

Signed-off-by: David Kastrup Signed-off-by: Junio C Hamano