summaryrefslogtreecommitdiffstats
path: root/combine-diff.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt2024-12-061-0/+1
* combine-diff: fix leaking lost linesPatrick Steinhardt2024-11-051-2/+3
* diff: fix leaking orderfile optionPatrick Steinhardt2024-09-271-2/+1
* global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt2024-06-141-0/+2
* refs: refactor `resolve_gitlink_ref()` to accept a repositoryPatrick Steinhardt2024-05-171-1/+2
* Merge branch 'js/check-null-from-read-object-file'Junio C Hamano2024-02-151-0/+2
|\
| * Always check the return value of `repo_read_object_file()`Johannes Schindelin2024-02-061-0/+2
* | treewide: remove unnecessary includes in source filesElijah Newren2023-12-261-1/+0
|/
* treewide: remove unnecessary includes for wrapper.hCalvin Wan2023-07-051-1/+0
* object-store-ll.h: split this header out of object-store.hElijah Newren2023-06-211-1/+1
* commit.h: reduce unnecessary includesElijah Newren2023-04-241-0/+1
* treewide: remove cache.h inclusion due to previous changesElijah Newren2023-04-241-1/+1
* treewide: remove double forward declaration of read_in_fullElijah Newren2023-04-111-0/+1
* object-name.h: move declarations for object-name.c functions from cache.hElijah Newren2023-04-111-0/+1
* treewide: be explicit about dependence on convert.hElijah Newren2023-04-111-0/+1
* Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-4/+4
|\
| * libs: use "struct repository *" argument, not "the_repository"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| * cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
| * cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-3/+3
* | environment.h: move declarations for environment.c functions from cache.hElijah Newren2023-03-211-0/+1
* | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-241-0/+1
|/
* diff: mark unused parameters in callbacksJeff King2022-12-131-1/+1
* Merge branch 'rs/combine-diff-with-incompatible-options'Junio C Hamano2022-07-121-0/+7
|\
| * combine-diff: abort if --output is givenRené Scharfe2022-06-211-0/+3
| * combine-diff: abort if --ignore-matching-lines is givenRené Scharfe2022-06-211-0/+4
* | tree-wide: apply equals-null.cocciJunio C Hamano2022-05-021-2/+2
|/
* Merge branch 'ab/pickaxe-pcre2'Junio C Hamano2021-07-141-2/+3
|\
| * xdiff-interface: prepare for allowing early returnÆvar Arnfjörð Bjarmason2021-05-111-2/+3
* | hash: provide per-algorithm null OIDsbrian m. carlson2021-04-271-1/+1
|/
* use CALLOC_ARRAYRené Scharfe2021-03-141-10/+10
* Merge branch 'jk/diff-cc-oidfind-fix'Junio C Hamano2020-10-051-2/+41
|\
| * combine-diff: handle --find-object in multitree code pathJeff King2020-09-301-2/+41
* | diff: get rid of redundant 'dense' argumentSergey Organov2020-09-291-12/+9
|/
* oid_array: rename source file from sha1-arrayJeff King2020-03-301-1/+1
* combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algobrian m. carlson2019-08-201-1/+1
* Merge branch 'en/combined-all-paths'Junio C Hamano2019-03-071-11/+65
|\
| * log,diff-tree: add --combined-all-paths optionElijah Newren2019-02-081-11/+65
* | Merge branch 'jk/diff-cc-stat-fixes'Junio C Hamano2019-02-051-6/+11
|\ \ | |/ |/|
| * combine-diff: treat --dirstat like --statJeff King2019-01-241-0/+1
| * combine-diff: treat --summary like --statJeff King2019-01-241-0/+1
| * combine-diff: treat --shortstat like --statJeff King2019-01-241-0/+1
| * combine-diff: factor out stat-format maskJeff King2019-01-241-6/+8
* | Merge branch 'nd/the-index'Junio C Hamano2019-01-041-1/+1
|\ \ | |/ |/|
| * notes-cache.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-1/+1
* | Merge branch 'jk/xdiff-interface'Junio C Hamano2018-11-131-31/+36
|\ \ | |/ |/|
| * combine-diff: use an xdiff hunk callbackJeff King2018-11-051-31/+36
| * xdiff-interface: provide a separate consume callback for hunksJeff King2018-11-021-2/+2
* | Merge branch 'nd/the-index'Junio C Hamano2018-10-191-13/+19
|\ \
| * | userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
| * | diff.c: remove the_index dependency in textconv() functionsNguyễn Thái Ngọc Duy2018-09-211-11/+16