summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* index: introduce git_index_iteratorethomson/index_iteratorEdward Thomson2018-11-145-3/+184
* Merge pull request #4705 from libgit2/ethomson/applyEdward Thomson2018-11-1121-21/+3697
|\
| * test: ensure applying a patch can't delete a file twiceethomson/applyEdward Thomson2018-11-052-0/+45
| * apply: test re-adding a file after removing itEdward Thomson2018-11-053-10/+63
| * apply: test modifying a file after renaming itEdward Thomson2018-11-053-12/+125
| * apply: test renaming a file after modifying itEdward Thomson2018-11-052-5/+20
| * apply: test that we can't rename a file after modifying itEdward Thomson2018-11-052-0/+36
| * apply: test modify delta after rename deltaEdward Thomson2018-11-052-0/+50
| * apply: test multiple deltas to new fileEdward Thomson2018-11-052-0/+43
| * apply: handle multiple deltas to the same fileEdward Thomson2018-11-053-7/+79
| * apply: test rename 1 to 2Edward Thomson2018-11-052-0/+36
| * apply: test rename 2 to 1Edward Thomson2018-11-052-0/+34
| * apply: test circular renameEdward Thomson2018-11-052-0/+35
| * apply: test rename A -> B -> C scenariosEdward Thomson2018-11-052-0/+142
| * apply: handle exact renamesEdward Thomson2018-11-055-4/+54
| * apply: validate unchanged mode when applying bothEdward Thomson2018-11-052-0/+30
| * apply: test a patch with rename and modificationEdward Thomson2018-11-052-0/+40
| * patch: add tests for aborting hunk callbackJason Haslam2018-11-051-0/+71
| * patch: add support for partial patch applicationJason Haslam2018-11-053-0/+313
| * reader: free is unused and unnecessaryEdward Thomson2018-11-052-20/+0
| * apply: introduce a hunk callbackEdward Thomson2018-11-056-10/+101
| * apply tests: tests a diff w/ many small changesEdward Thomson2018-11-052-0/+112
| * apply tests: test delta callback skipEdward Thomson2018-11-051-0/+38
| * apply tests: test delta callback errorsEdward Thomson2018-11-051-0/+52
| * apply: introduce a delta callbackEdward Thomson2018-11-052-3/+34
| * apply: move location to an argument, not the optsEdward Thomson2018-11-056-108/+66
| * apply: use an indexwriterEdward Thomson2018-11-051-3/+15
| * apply tests: ensure mode changes occurEdward Thomson2018-11-053-0/+62
| * apply tests: test with CR/LF filteringEdward Thomson2018-11-051-0/+53
| * reader: apply working directory filtersEdward Thomson2018-11-051-2/+13
| * apply: validate workdir contents match index for BOTHEdward Thomson2018-11-052-17/+60
| * reader: optionally validate index matches workdirEdward Thomson2018-11-053-11/+37
| * apply tests: ensure we can patch a modified fileEdward Thomson2018-11-054-0/+125
| * apply: use preimage as the checkout baselineEdward Thomson2018-11-053-32/+79
| * apply tests: test index+workdir applicationEdward Thomson2018-11-051-0/+281
| * apply: convert checkout conflicts to apply failuresEdward Thomson2018-11-051-0/+7
| * apply test: apply with non-conflicting changesEdward Thomson2018-11-052-0/+70
| * apply tests: ensure apply failures leave index unmodifiedEdward Thomson2018-11-051-0/+34
| * apply: when preimage file is missing, return EAPPLYFAILEdward Thomson2018-11-051-1/+7
| * apply: simplify checkout vs index applicationEdward Thomson2018-11-051-77/+126
| * apply tests: modified wd items are ok when applying to indexEdward Thomson2018-11-041-0/+43
| * apply tests: ensure we can add and remove files from the indexEdward Thomson2018-11-041-0/+56
| * apply: remove deleted paths from indexEdward Thomson2018-11-041-0/+19
| * apply tests: GIT_APPLY_LOCATION_INDEX with parsed patchesEdward Thomson2018-11-041-0/+28
| * apply tests: GIT_APPLY_LOCATION_INDEX with generated patchesEdward Thomson2018-11-042-0/+94
| * apply tests: move helpers into common areaEdward Thomson2018-11-042-152/+155
| * apply: test that failures don't dirty workdirEdward Thomson2018-11-041-0/+29
| * apply: return a specific exit code on failureEdward Thomson2018-11-042-1/+2
| * apply: test a patch can be applied even with a modified indexEdward Thomson2018-11-041-22/+15
| * apply: test that the index is not modifiedEdward Thomson2018-11-041-0/+76
View Lorry Controller Status