git/compat, branch v2.0.3

Merge branch 'cb/byte-order' into maint

2014-07-22T17:25:02Z

* cb/byte-order: compat/bswap.h: fix endianness detection compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER

use xcalloc() to allocate zero-initialized memory

2014-07-21T17:30:21Z

Use xcalloc() instead of xmalloc() followed by memset() to allocate and zero out memory because it's shorter and avoids duplicating the function parameters. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

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()

compat/bswap.h: fix endianness detection

2014-05-30T18:48:28Z

The changes to make detection of endianness more portable had a bug that breaks on (at least) Solaris x86. The bug appears to be a simple copy/paste typo. It checks for _BIG_ENDIAN and not _LITTLE_ENDIAN for both the case where we would decide the system is big endian and little endian. Instead, the second test should be for _LITTLE_ENDIAN and not _BIG_ENDIAN. Two fixes were possible: 1. Change the negation order of the conditions in the second test. 2. Reverse the order of the conditions in the second test. Use the second option so that the condition we expect is always a positive check. Signed-off-by: Ben Walton Signed-off-by: Junio C Hamano

compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN

2014-05-02T19:36:10Z

The previous commit swaps the order we check the macros defined by the compiler and the system headers from the original. Since the order of check should not matter (i.e. it is insane to define both __BIG_ENDIAN and friends and BIG_ENDIAN and friends and in a conflicting way), it is the most conservative thing to do not to change it. Signed-off-by: Junio C Hamano

compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER

2014-05-02T19:31:59Z

Signed-off-by: Charles Bailey Signed-off-by: Junio C Hamano

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

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

Merge branch 'mr/msvc-link-with-lcurl'

2014-03-31T23:31:07Z

* mr/msvc-link-with-lcurl: MSVC: allow linking with the cURL library