summaryrefslogtreecommitdiff
path: root/tests/diff
Commit message (Expand)AuthorAgeFilesLines
* tests: take the version from our defineCarlos Martín Nieto2016-03-031-1/+1
* tests: use legitimate object idsEdward Thomson2016-02-282-7/+9
* Merge pull request #3613 from ethomson/fixupsCarlos Martín Nieto2016-02-181-2/+2
|\
| * win32: introduce p_timeval that isn't stupidEdward Thomson2016-02-121-2/+2
* | Horrible fix for #3173.Arthur Schreiber2016-02-111-2/+2
|/
* diff: include commit message when formatting patchPatrick Steinhardt2015-12-011-0/+41
* Fix some warningsJacques Germishuys2015-11-201-0/+1
* Merge pull request #3498 from ethomson/windows_symlinksCarlos Martín Nieto2015-11-081-0/+61
|\
| * diff: test "symlinks" in wd are respected on win32Edward Thomson2015-11-031-0/+61
* | Add diff progress callback.Jason Haslam2015-11-022-2/+29
|/
* tests: Fix warningsvmg/crudVicent Marti2015-10-211-1/+1
* Fix binary diffsGuille -bisho-2015-09-251-7/+14
* diff::workdir: ensure ignored files are not returnedEdward Thomson2015-09-121-0/+43
* iterator: saner pathlist matching for idx iteratorEdward Thomson2015-08-311-24/+0
* diff: use new iterator pathlist handlingEdward Thomson2015-08-301-1/+25
* diff: better document GIT_DIFF_PATHSPEC_DISABLEEdward Thomson2015-08-281-0/+210
* iterator: use an options struct instead of argsEdward Thomson2015-08-281-14/+46
* diff: don't error out on an invalid regexcmn/regex-nofailCarlos Martín Nieto2015-08-151-0/+26
* Added git_diff_index_to_index()Pierre-Olivier Latour2015-06-301-0/+32
* Merge pull request #3265 from libgit2/leaksCarlos Martín Nieto2015-06-271-1/+5
|\
| * diff: fix leaks in diff printingCarlos Martín Nieto2015-06-261-1/+5
* | Merge pull request #3263 from git-up/fixesCarlos Martín Nieto2015-06-262-2/+0
|\ \ | |/ |/|
| * Removed unused variablesPierre-Olivier Latour2015-06-262-2/+0
* | test-diff-blob: Pass proper nibble sizesvmg/prefix-lenVicent Marti2015-06-261-14/+14
|/
* diff: test we don't update index unnecessarilyEdward Thomson2015-06-261-7/+69
* Rename FALLBACK to UNSPECIFIEDcmn/rename-unspecifiedCarlos Martín Nieto2015-06-251-1/+1
* Merge pull request #3097 from libgit2/cmn/submodule-config-stateCarlos Martín Nieto2015-06-242-9/+9
|\
| * submodule: add an ignore option to statusCarlos Martín Nieto2015-06-221-1/+1
| * submodule: make set_ignore() affect the configurationCarlos Martín Nieto2015-06-221-8/+8
* | diff::binary tests: empty diff when forced binaryEdward Thomson2015-06-241-0/+30
* | binary diff: test that the diff and patch otputs are the samecmn/diff-binary-patchCarlos Martín Nieto2015-06-241-0/+7
* | Merge pull request #3222 from git-up/conflictedEdward Thomson2015-06-231-1/+30
|\ \
| * | Fixed GIT_DELTA_CONFLICTED not returned in some casesPierre-Olivier Latour2015-06-231-1/+30
* | | Merge pull request #3226 from libgit2/cmn/racy-diff-againEdward Thomson2015-06-232-39/+2
|\ \ \ | |/ / |/| |
| * | tests: move racy tests to the indexCarlos Martín Nieto2015-06-221-100/+0
| * | 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
| * | diff: check files with the same or newer timestampsCarlos Martín Nieto2015-06-222-0/+35
| |/
* | Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()Pierre-Olivier Latour2015-06-221-0/+36
|/
* Merge pull request #3219 from libgit2/cmn/racy-diffCarlos Martín Nieto2015-06-172-0/+45
|\
| * tests: tick the index when we count OID calculationsCarlos Martín Nieto2015-06-161-0/+6
| * diff: add failing test for racy-git in the indexCarlos Martín Nieto2015-06-161-0/+39
* | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-152-9/+17
|/
* binary diff: test binary blob to blob testsEdward Thomson2015-06-121-0/+130
* diff: introduce binary diff callbacksEdward Thomson2015-06-129-163/+182
* binary diff: test index->workdir binary diffsEdward Thomson2015-06-121-0/+99
* Fixed build warnings on Xcode 6.1Pierre-Olivier Latour2015-06-022-2/+2
* diff conflicts: test index to workdir w/ conflictsEdward Thomson2015-05-281-0/+45
* diff conflicts: add tests for tree to indexEdward Thomson2015-05-283-2/+78
* git_path_dirload: use git_path_diriterEdward Thomson2015-05-011-1/+1
View Lorry Controller Status