delta/libgit2.git, branch cmn/diff-binary-patch

binary diff: test that the diff and patch otputs are the same

2015-06-24T12:33:02+00:00

We test the generation of the textual patch via the patch function,
which are just one of two possibilities to get the output.

Add a second patch generation via the diff function to make sure both
outputs are in sync.

Merge pull request #3251 from git-up/fixes

2015-06-24T04:30:19+00:00

Fixes

Fixed invalid error handling in git_repository_open_ext()

2015-06-24T03:59:03+00:00

Fixed Xcode 6.1 build warnings

2015-06-24T03:57:09+00:00

Merge pull request #3222 from git-up/conflicted

2015-06-24T03:52:03+00:00

Fixed GIT_DELTA_CONFLICTED not returned in some cases

Merge pull request #3131 from urkud/const-char

2015-06-24T03:40:02+00:00

Add `const` qualifier

Merge pull request #3226 from libgit2/cmn/racy-diff-again

2015-06-24T03:30:58+00:00

racy-git, the missing link

Merge pull request #3249 from libgit2/cmn/repo-version-check

2015-06-24T03:17:18+00:00

Check the repository version

repository: check the format version

2015-06-23T18:44:27+00:00

This is something we do on re-init but not when opening a
repository. This hasn't particularly mattered up to now as the version
has been 0 ever since the first release of git, but the times, they're
a-changing and we will soon see version 1 in the wild. We need to make
sure we don't open those.

repository: don't error out if there is no version

2015-06-23T18:43:49+00:00

git will assume the repository format version is 0 if the value is not
there. Do the same.