summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add a note about racy-git in CHANGELOGcmn/racy-diff-againCarlos Martín Nieto2015-06-221-0/+3
* index: add a diff test for smudging a file which becomes emptyCarlos Martín Nieto2015-06-221-0/+43
* tests: move racy tests to the indexCarlos Martín Nieto2015-06-221-4/+4
* merge: work around write-side racy protection when hacking the indexCarlos Martín Nieto2015-06-221-1/+14
* tests: set racy times manuallyCarlos Martín Nieto2015-06-221-6/+26
* tests: plug leaks in the racy testCarlos Martín Nieto2015-06-221-1/+9
* index: check racily clean entries more thoroughlyCarlos Martín Nieto2015-06-221-2/+41
* diff: check files with the same or newer timestampsCarlos Martín Nieto2015-06-226-3/+61
* Merge pull request #3233 from ethomson/status_typechangeCarlos Martín Nieto2015-06-204-12/+64
|\
| * diff: preserve original mode in the indexEdward Thomson2015-06-203-12/+16
| * status: test that symlinks don't lose their modeEdward Thomson2015-06-201-0/+48
|/
* Merge pull request #3238 from git-up/double_freeEdward Thomson2015-06-201-2/+0
|\
| * Fixed index being double-freed in stash testsPierre-Olivier Latour2015-06-201-2/+0
* | Merge pull request #3236 from libgit2/cmn/index-checksumEdward Thomson2015-06-206-16/+63
|\ \ | |/ |/|
| * 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 #3232 from Therzok/patch-2Carlos Martín Nieto2015-06-201-1/+1
|\ \
| * | Quote LIBSSH2_LIBRARIES callMarius Ungureanu2015-06-191-1/+1
* | | tests: tick over five seconds instead of oneCarlos Martín Nieto2015-06-201-1/+1
|/ /
* | Merge pull request #3229 from git-up/build_warningsCarlos Martín Nieto2015-06-173-2/+2
|\ \
| * | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-173-2/+2
|/ /
* | Merge pull request #3227 from jeffhostetler/memory_leak__tests_network_refspecsCarlos Martín Nieto2015-06-171-0/+2
|\ \ | |/ |/|
| * Fix memory leak in tests/network/refspecs.cJeff Hostetler2015-06-171-0/+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