git/compat, branch v2.14.2

Merge branch 'rs/win32-syslog-leakfix' into maint

2017-09-10T08:02:54Z

Memory leak in an error codepath has been plugged. * rs/win32-syslog-leakfix: win32: plug memory leak on realloc() failure in syslog()

Merge branch 'rs/bswap-ubsan-fix' into maint

2017-08-23T21:33:46Z

Code clean-up. * rs/bswap-ubsan-fix: bswap: convert get_be16, get_be32 and put_be32 to inline functions bswap: convert to unsigned before shifting in get_be32

win32: plug memory leak on realloc() failure in syslog()

2017-08-10T20:57:52Z

If realloc() fails then the original buffer is still valid. Free it before exiting the function. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'tb/push-to-cygwin-unc-path'

2017-07-18T19:48:09Z

On Cygwin, similar to Windows, "git push //server/share/repository" ought to mean a repository on a network share that can be accessed locally, but this did not work correctly due to stripping the double slashes at the beginning. This may need to be heavily tested before it gets unleashed to the wild, as the change is at a fairly low-level code and would affect not just the code to decide if the push destination is local. There may be unexpected fallouts in the path normalization. * tb/push-to-cygwin-unc-path: cygwin: allow pushing to UNC paths

bswap: convert get_be16, get_be32 and put_be32 to inline functions

2017-07-17T21:54:15Z

Simplify the implementation and allow callers to use expressions with side-effects by turning the macros get_be16, get_be32 and put_be32 into inline functions. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

bswap: convert to unsigned before shifting in get_be32

2017-07-17T21:54:13Z

The pointer p is dereferenced and we get an unsigned char. Before shifting it's automatically promoted to int. Left-shifting a signed 32-bit value bigger than 127 by 24 places is undefined. Explicitly convert to a 32-bit unsigned type to avoid undefined behaviour if the highest bit is set. Found with Clang's UBSan. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

cygwin: allow pushing to UNC paths

2017-07-05T21:01:03Z

cygwin can use an UNC path like //server/share/repo $ cd //server/share/dir $ mkdir test $ cd test $ git init --bare However, when we try to push from a local Git repository to this repo, there is a problem: Git converts the leading "//" into a single "/". As cygwin handles an UNC path so well, Git can support them better: - Introduce cygwin_offset_1st_component() which keeps the leading "//", similar to what Git for Windows does. - Move CYGWIN out of the POSIX in the tests for path normalization in t0060 Signed-off-by: Torsten Bögershausen Signed-off-by: Junio C Hamano

Spelling fixes

2017-06-27T17:35:49Z

Signed-off-by: Ville Skyttä Signed-off-by: Junio C Hamano

Merge branch 'bw/config-h'

2017-06-24T21:28:41Z

Fix configuration codepath to pay proper attention to commondir that is used in multi-worktree situation, and isolate config API into its own header file. * bw/config-h: config: don't implicitly use gitdir or commondir config: respect commondir setup: teach discover_git_directory to respect the commondir config: don't include config.h by default config: remove git_config_iter config: create config.h

config: don't include config.h by default

2017-06-15T19:56:22Z

Stop including config.h by default in cache.h. Instead only include config.h in those files which require use of the config system. Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano