summaryrefslogtreecommitdiffstats
path: root/apply.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt2024-12-061-0/+1
* Merge branch 'ps/apply-leakfix'Junio C Hamano2024-09-251-249/+200
|\
| * apply: refactor `struct image` to use a `struct strbuf`Patrick Steinhardt2024-09-171-121/+73
| * apply: rename members that track line count and allocation lengthPatrick Steinhardt2024-09-171-46/+45
| * apply: refactor code to drop `line_allocated`Patrick Steinhardt2024-09-171-19/+14
| * apply: introduce macro and function to init imagesPatrick Steinhardt2024-09-171-8/+14
| * apply: rename functions operating on `struct image`Patrick Steinhardt2024-09-171-31/+30
| * apply: reorder functions to move image-related things togetherPatrick Steinhardt2024-09-171-53/+53
* | Merge branch 'ps/environ-wo-the-repository'Junio C Hamano2024-09-231-1/+2
|\ \
| * | environment: make `get_git_dir()` accept a repositoryPatrick Steinhardt2024-09-121-1/+2
| |/
* / apply: support --ours, --theirs, and --union for three-way mergesAlex Henrie2024-09-091-2/+18
|/
* Merge branch 'jk/apply-patch-mode-check-fix'Junio C Hamano2024-08-141-0/+1
|\
| * apply: canonicalize modes read from patchesJeff King2024-08-051-0/+1
* | Merge branch 'ps/leakfixes-more'Junio C Hamano2024-07-081-32/+56
|\ \
| * | apply: fix leaking string in `match_fragment()`Patrick Steinhardt2024-06-111-32/+55
| * | parse-options: fix leaks for users of OPT_FILENAMEPatrick Steinhardt2024-06-111-0/+1
| |/
* | global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt2024-06-141-0/+2
* | hash: require hash algorithm in `oidread()` and `oidclr()`Patrick Steinhardt2024-06-141-1/+1
|/
* Merge branch 'rj/add-i-leak-fix'Junio C Hamano2024-04-251-1/+3
|\
| * apply: plug a leak in apply_dataRubén Justo2024-04-231-1/+3
* | apply: avoid using fixed-size buffer in write_out_one_reject()René Scharfe2024-04-161-16/+17
|/
* Merge branch 'rs/apply-reject-fd-leakfix'Junio C Hamano2024-04-151-2/+5
|\
| * apply: don't leak fd on fdopen() errorRené Scharfe2024-04-051-2/+5
* | Merge branch 'rs/apply-lift-path-length-limit'Junio C Hamano2024-04-151-6/+9
|\ \
| * | apply: avoid fixed-size buffer in create_one_file()René Scharfe2024-04-051-6/+9
| |/
* | Merge branch 'jc/apply-parse-diff-git-header-names-fix'Junio C Hamano2024-04-091-1/+8
|\ \
| * | apply: parse names out of "diff --git" more carefullyJunio C Hamano2024-03-191-1/+8
* | | Merge branch 'jc/am-whitespace-doc'Junio C Hamano2024-02-281-1/+2
|\ \ \
| * | | doc: add shortcut to "am --whitespace=<action>"Junio C Hamano2024-02-141-1/+2
* | | | Merge branch 'cp/apply-core-filemode'Junio C Hamano2024-02-271-3/+13
|\ \ \ \ | |_|_|/ |/| | |
| * | | apply: code simplificationJunio C Hamano2023-12-271-4/+8
| * | | apply: correctly reverse patch's pre- and post-image mode bitsJunio C Hamano2023-12-271-4/+4
| * | | apply: ignore working tree filemode when !core.filemodeChandra Pratap2023-12-271-2/+8
| |/ /
* / / treewide: remove unnecessary includes in source filesElijah Newren2023-12-261-1/+0
|/ /
* | Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano2023-07-171-2/+0
|\ \
| * | git-compat-util: move alloc macros to git-compat-util.hCalvin Wan2023-07-051-1/+0
| * | treewide: remove unnecessary includes for wrapper.hCalvin Wan2023-07-051-1/+0
* | | Merge branch 'pw/apply-too-large'Junio C Hamano2023-07-061-3/+4
|\ \ \ | |/ / |/| |
| * | apply: improve error messages when reading patchPhillip Wood2023-06-261-3/+4
* | | object-store-ll.h: split this header out of object-store.hElijah Newren2023-06-211-1/+1
* | | merge-ll: rename from ll-mergeElijah Newren2023-06-211-1/+1
* | | git-compat-util.h: remove unneccessary include of wildmatch.hElijah Newren2023-06-211-0/+1
* | | repository: remove unnecessary include of path.hElijah Newren2023-06-211-0/+1
* | | cache.h: remove this no-longer-used headerElijah Newren2023-06-211-1/+1
* | | read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren2023-06-211-0/+1
* | | name-hash.h: move declarations for name-hash.c from cache.hElijah Newren2023-06-211-0/+1
* | | Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano2023-05-101-0/+3
|\ \ \
| * | | ws.h: move declarations for ws.c functions from cache.hElijah Newren2023-04-241-0/+1
| * | | base85.h: move declarations for base85.c functions from cache.hElijah Newren2023-04-241-0/+1
| * | | symlinks.h: move declarations for symlinks.c functions from cache.hElijah Newren2023-04-241-0/+1