summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* index: include conflicts in `git_index_read_index`ethomson/read_index_conflictsEdward Thomson2016-06-294-14/+119
* index: refactor common `read_index` functionalityEdward Thomson2016-06-291-13/+36
* Merge pull request #3813 from stinb/submodule-update-fetchEdward Thomson2016-06-292-7/+27
|\
| * submodule: Try to fetch when update fails to find the target commit in the su...Jason Haslam2016-06-282-7/+27
* | Merge pull request #3842 from pks-t/pks/double-freeEdward Thomson2016-06-291-8/+18
|\ \ | |/ |/|
| * blame: do not decrement commit refcount in make_originPatrick Steinhardt2016-06-291-8/+18
|/
* Merge pull request #3223 from ethomson/applyEdward Thomson2016-06-2564-2683/+7255
|\
| * patch: show copy information for identical copiesEdward Thomson2016-06-256-24/+147
| * patch::parse: test diff with exact rename and copyEdward Thomson2016-06-251-0/+5
| * patch::parse: test diff with simple renameEdward Thomson2016-06-251-12/+27
| * patch::parse: handle patches with no hunksEdward Thomson2016-06-251-1/+3
| * diff::parse tests: test parsing a diffEdward Thomson2016-06-253-0/+107
| * patch: zero id and abbrev length for empty filesEdward Thomson2016-05-261-8/+20
| * patch: identify non-binary patches as `NOT_BINARY`Edward Thomson2016-05-261-4/+3
| * Introduce `git_diff_to_buf`Edward Thomson2016-05-262-0/+24
| * introduce `git_diff_from_buffer` to parse diffsEdward Thomson2016-05-268-52/+250
| * patch: differentiate not found and invalid patchesEdward Thomson2016-05-262-7/+77
| * git_patch_parse_ctx: refcount the contextEdward Thomson2016-05-266-102/+172
| * git_diff_generated: abstract generated diffsEdward Thomson2016-05-2615-1672/+1822
| * parse: introduce parse_ctx_contains_sEdward Thomson2016-05-261-18/+25
| * patch: `patch_diff` -> `patch_generated`Edward Thomson2016-05-266-112/+119
| * vector: more sensible names for `grow_at`/`shrink_at`Edward Thomson2016-05-264-26/+26
| * patch: `git_patch_from_patchfile` -> `git_patch_from_buffer`Edward Thomson2016-05-266-41/+44
| * patch: provide static string `advance_expected`Edward Thomson2016-05-261-10/+13
| * patch: formatting cleanupsEdward Thomson2016-05-262-2/+2
| * git_vector_grow/shrink: correct shrink, and testsEdward Thomson2016-05-262-14/+117
| * apply: test postimages that grow/shrink originalEdward Thomson2016-05-262-0/+131
| * git_buf_quote/unquote: handle > \177Edward Thomson2016-05-262-2/+7
| * patch application: drop unnecessary `patch_image_init`Edward Thomson2016-05-261-10/+2
| * patch parse: dup the patch from the callersEdward Thomson2016-05-263-11/+28
| * patch parsing: squash some memory leaksEdward Thomson2016-05-262-0/+9
| * patch: drop some warningsEdward Thomson2016-05-262-6/+5
| * patch: use strlen to mean string lengthEdward Thomson2016-05-261-29/+27
| * patch: show modes when only the mode has changedEdward Thomson2016-05-261-13/+21
| * patch: quote filenames when necessaryEdward Thomson2016-05-261-33/+96
| * git_buf_quote: quote ugly charactersEdward Thomson2016-05-263-27/+120
| * patch: don't print some headers on pure renamesEdward Thomson2016-05-261-4/+13
| * Introduce git_patch_options, handle prefixesEdward Thomson2016-05-265-154/+220
| * patch printing: include rename informationEdward Thomson2016-05-262-2/+25
| * patch_parse: don't set new mode when deletedEdward Thomson2016-05-261-4/+4
| * patch_parse: use names from `diff --git` headerEdward Thomson2016-05-262-18/+44
| * patch_parse: set binary flagEdward Thomson2016-05-261-0/+1
| * patch_parse: test roundtrip patch parsing -> printEdward Thomson2016-05-261-0/+166
| * patch_parse: ensure we can parse a patchEdward Thomson2016-05-261-0/+31
| * patch: when parsing, set nfiles correctly in deltaEdward Thomson2016-05-261-0/+3
| * diff: include oid length in deltasEdward Thomson2016-05-265-9/+44
| * patch parse: unset path prefixEdward Thomson2016-05-261-0/+4
| * apply: move patch data to patch_common.hEdward Thomson2016-05-263-2/+2
| * patch: use delta's old_file/new_file membersEdward Thomson2016-05-264-56/+27
| * patch: abstract patches into diff'ed and parsedEdward Thomson2016-05-2613-1361/+1408
View Lorry Controller Status