delta/libgit2.git/src, branch refresh-config-snapshot

Patch from @carlosmn to refresh the parent config before snapshotting.

2014-10-23T04:21:30+00:00

Merge pull request #2609 from linquize/describe-opts

2014-10-13T20:59:56+00:00

Handle describe options better

Merge pull request #2615 from ethomson/mount_points

2014-10-13T20:52:44+00:00

Mount points

Don't copy buffer in checkout unless needed

2014-10-13T17:36:20+00:00

Ensure filters (i.e. CRLF) are applied when checking out conflict content

2014-10-13T17:36:18+00:00

is_empty_dir (wi32): cope with empty mount points

2014-10-13T14:58:05+00:00

FindFirstFile will fail with INVALID_HANDLE_VALUE if there are no
children to the given path, which can happen if the given path is a
file (and obviously has no children) or if the given path is an empty
mount point.  (Most directories have at least directory entries '.'
and '..', but ridiculously another volume mounted in another drive
letter's path space do not, and thus have nothing to enumerate.)

If FindFirstFile fails, check if this is a directory-like thing
(a mount point).

p_lstat win32: don't canonicalize volume mounts

2014-10-13T14:58:03+00:00

A reparse point that is an IO_REPARSE_TAG_MOUNT_POINT could be
a junction or an actual filesystem mount point.  (Who knew?)
If it's the latter, its reparse point will report the actual
volume information \??\Volume{GUID}\ and we should not attempt
to dereference that further, instead readlink should report
EINVAL since it's not a symlink / junction and its original
path was canonical.

Yes, really.

There is no "z" size specifier on MSVC

2014-10-13T14:32:26+00:00

See http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx and https://stackoverflow.com/questions/6655410/why-doesnt-zd-printf-format-work-in-vs2010

Signed-off-by: Sven Strickroth

describe: Initialize options for git_describe_format() if null

2014-10-10T23:52:47+00:00

describe: Do not crash if pass null option to git_describe_commit()

2014-10-10T23:52:47+00:00