summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* index: make relative comparison use the checksum as wellcmn/index-checksumCarlos Martín Nieto2015-06-204-9/+6
* index: use the checksum to check whether it's been modifiedCarlos Martín Nieto2015-06-193-5/+55
* index: user a better assertion when comparing sizesCarlos Martín Nieto2015-06-191-2/+2
* Merge pull request #3219 from libgit2/cmn/racy-diffCarlos Martín Nieto2015-06-1714-7/+229
|\
| * checkout: allow workdir to contain checkout targetethomson/racy-diffcmn/racy-diffEdward Thomson2015-06-161-3/+14
| * merge::workdir::dirty: tick idx to defeat racy-gitEdward Thomson2015-06-161-0/+12
| * Introduce p_utimes and p_futimesEdward Thomson2015-06-166-6/+110
| * tests: tick the index when we count OID calculationsCarlos Martín Nieto2015-06-165-19/+34
| * crlf: tick the index forward to work around racy-git behaviourCarlos Martín Nieto2015-06-162-4/+27
| * index: zero the size of racily-clean entriesCarlos Martín Nieto2015-06-161-0/+18
| * diff: add failing test for racy-git in the indexCarlos Martín Nieto2015-06-161-0/+39
* | Merge pull request #3209 from libgit2/cmn/double-authorEdward Thomson2015-06-162-0/+17
|\ \
| * | commit: ignore multiple author fieldscmn/double-authorCarlos Martín Nieto2015-06-112-0/+17
* | | Merge pull request #3225 from libgit2/cmn/url-emptyEdward Thomson2015-06-161-2/+6
|\ \ \
| * | | remote: return EINVALIDSPEC when given an empty URLcmn/url-emptyCarlos Martín Nieto2015-06-161-2/+6
|/ / /
* | | Merge pull request #3221 from git-up/build_warningsCarlos Martín Nieto2015-06-167-17/+24
|\ \ \ | |_|/ |/| |
| * | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-157-17/+24
* | | Merge pull request #3216 from dprofeta/fixTransactionVisibilityEdward Thomson2015-06-151-0/+1
|\ \ \ | |/ / |/| |
| * | Fix visibility of transaction symbolDamien PROFETA2015-06-121-0/+1
* | | Merge pull request #3220 from libgit2/cmn/readdirEdward Thomson2015-06-152-5/+4
|\ \ \
| * | | path: remove unnecessary readdir_r usagecmn/readdirCarlos Martín Nieto2015-06-152-5/+4
|/ / /
* | | Merge pull request #3171 from libgit2/cmn/link-fallbackCarlos Martín Nieto2015-06-151-2/+15
|\ \ \
| * | | clone: fall back to copying when linking does not workcmn/link-fallbackCarlos Martín Nieto2015-06-011-2/+15
* | | | Fix in stransport_stream.c for usage of SecCopyErrorMessageString(), which is...Logan Collins2015-06-151-0/+5
* | | | Merge pull request #3177 from ethomson/binary_diffCarlos Martín Nieto2015-06-1520-376/+926
|\ \ \ \
| * | | | binary diff: document changes in CHANGELOGEdward Thomson2015-06-121-0/+4
| * | | | patch: include diff options on blob->blob diffsEdward Thomson2015-06-121-1/+2
| * | | | binary diff: test binary blob to blob testsEdward Thomson2015-06-121-0/+130
| * | | | diff: introduce binary diff callbacksEdward Thomson2015-06-1218-375/+691
| * | | | binary diff: test index->workdir binary diffsEdward Thomson2015-06-121-0/+99
| | |/ / | |/| |
* | | | Merge pull request #3217 from jeffhostetler/leak_checkout_icaseCarlos Martín Nieto2015-06-151-0/+2
|\ \ \ \
| * | | | Fix leaks in tests/checkout/icaseJeff Hostetler2015-06-121-0/+2
* | | | | Merge pull request #3215 from jeffhostetler/windows_leak_diriterCarlos Martín Nieto2015-06-121-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix memory leak on windows in diriter.Jeff Hostetler2015-06-121-0/+2
| |/ / /
* | | | Merge pull request #3208 from git-up/secure_transportCarlos Martín Nieto2015-06-121-20/+36
|\ \ \ \
| * | | | Fixed some Secure Transport issues on OS XPierre-Olivier Latour2015-06-111-20/+36
* | | | | Merge pull request #3214 from libgit2/cmn/push-testsCarlos Martín Nieto2015-06-123-5/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | clone: set the credentials callback during testingcmn/push-testsCarlos Martín Nieto2015-06-121-0/+1
| * | | | push: pass the callbacks during setup as wellCarlos Martín Nieto2015-06-121-3/+7
| * | | | travis: fail if we fail the push testsCarlos Martín Nieto2015-06-121-2/+2
|/ / / /
* | | | Merge pull request #3155 from mgorny/userpass-constCarlos Martín Nieto2015-06-111-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | cred_helpers: Add 'const' qualifiers to git_cred_userpass_payloadMichał Górny2015-05-241-2/+2
* | | | Merge pull request #3205 from ethomson/crlf_queryCarlos Martín Nieto2015-06-114-1/+133
|\ \ \ \
| * | | | Introduce `git_filter_list_contains`Edward Thomson2015-06-104-1/+133
* | | | | Merge pull request #3207 from ethomson/winhttp_eolCarlos Martín Nieto2015-06-111-29/+29
|\ \ \ \ \
| * | | | | Correct line endings on winhttp.defEdward Thomson2015-06-101-29/+29
* | | | | | Merge pull request #3174 from libgit2/cmn/idx-fill-holeEdward Thomson2015-06-101-3/+4
|\ \ \ \ \ \
| * | | | | | indexer: use lseek to extend the packfilecmn/idx-fill-holeCarlos Martín Nieto2015-06-021-3/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #3204 from git-up/git_diff_find_similarEdward Thomson2015-06-101-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fixed handling of GIT_DELTA_CONFLICTED in git_diff_find_similar()Pierre-Olivier Latour2015-06-101-4/+4
| | |/ / / | |/| | |