aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2024-03-15diff: add diff.srcPrefix and diff.dstPrefix configuration variablesPeter Hutterer1-2/+12
2024-02-15Merge branch 'jx/dirstat-parseopt-help'Junio C Hamano1-3/+3
2024-02-14diff: mark param1 and param2 as placeholdersJiang Xin1-3/+3
2024-02-06Merge branch 'jk/diff-external-with-no-index'Junio C Hamano1-1/+2
2024-01-29diff: handle NULL meta-info when spawning external diffJeff King1-1/+2
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano1-2/+0
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-2/+0
2023-12-09diff: give more detailed messages for bogus diff.* configJeff King1-2/+6
2023-12-09config: handle NULL value when parsing non-boolsJeff King1-3/+16
2023-11-02Merge branch 'jk/diff-result-code-cleanup' into maint-2.42Junio C Hamano1-4/+2
2023-11-02Merge branch 'jc/diff-exit-code-with-w-fixes' into maint-2.42Junio C Hamano1-15/+25
2023-09-29diff --stat: set the width defaults in a helper functionDragan Simic1-0/+7
2023-09-18diff --stat: add config option to limit filename widthDragan Simic1-2/+9
2023-09-01Merge branch 'jk/diff-result-code-cleanup'Junio C Hamano1-4/+2
2023-08-30Merge branch 'jc/diff-exit-code-with-w-fixes'Junio C Hamano1-15/+25
2023-08-21diff: the -w option breaks --exit-code for --raw and other output modesJunio C Hamano1-0/+6
2023-08-21diff: drop useless "status" parameter from diff_result_code()Jeff King1-4/+2
2023-08-18diff: teach "--stat -w --exit-code" to notice differencesJunio C Hamano1-0/+1
2023-08-18diff: mode-only change should be noticed by "--patch -w --exit-code"Junio C Hamano1-0/+3
2023-08-18diff: move the fallback "--exit-code" code downJunio C Hamano1-15/+15
2023-07-17Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano1-2/+0
2023-07-06Merge branch 'gc/config-context'Junio C Hamano1-8/+11
2023-07-06Merge branch 'pb/complete-diff-options'Junio C Hamano1-0/+4
2023-07-05git-compat-util: move alloc macros to git-compat-util.hCalvin Wan1-1/+0
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan1-1/+0
2023-06-28config: pass kvi to die_bad_number()Glen Choo1-4/+5
2023-06-28config: add ctx arg to config_fn_tGlen Choo1-4/+6
2023-06-26diff.c: mention completion above add_diff_optionsPhilippe Blain1-0/+4
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren1-1/+1
2023-06-21merge-ll: rename from ll-mergeElijah Newren1-1/+1
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-1/+1
2023-06-21read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren1-0/+1
2023-06-20Merge branch 'jk/log-follow-with-non-literal-pathspec'Junio C Hamano1-2/+27
2023-06-13Merge branch 'jc/diff-s-with-other-options'Junio C Hamano1-11/+13
2023-06-03diff: detect pathspec magic not supported by --followJeff King1-0/+15
2023-06-03diff: factor out --follow pathspec checkJeff King1-2/+12
2023-05-15Merge branch 'jc/dirstat-plug-leaks'Junio C Hamano1-14/+20
2023-05-09Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano1-0/+2
2023-05-05diff: fix interaction between the "-s" option and other optionsJunio C Hamano1-11/+13
2023-05-05diff: plug leaks in dirstatJunio C Hamano1-6/+11
2023-05-05diff: refactor common tail part of dirstat computationJunio C Hamano1-14/+15
2023-05-02Merge branch 'tb/ban-strtok'Junio C Hamano1-1/+1
2023-04-25Merge branch 'en/header-split-cache-h'Junio C Hamano1-0/+5
2023-04-24string-list: multi-delimiter `string_list_split_in_place()`Taylor Blau1-1/+1
2023-04-24ws.h: move declarations for ws.c functions from cache.hElijah Newren1-0/+1
2023-04-24base85.h: move declarations for base85.c functions from cache.hElijah Newren1-0/+1
2023-04-11pager.h: move declarations for pager.c functions from cache.hElijah Newren1-0/+1
2023-04-11object-file.h: move declarations for object-file.c functions from cache.hElijah Newren1-0/+1
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on oid-array.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on convert.hElijah Newren1-0/+1
2023-04-06Merge branch 'en/header-split-cleanup'Junio C Hamano1-0/+5
2023-04-06Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano1-3/+3
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-3/+3
2023-03-28cocci: apply the "promisor-remote.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+1
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-2/+2
2023-03-21Merge branch 'jk/format-patch-ignore-noprefix'Junio C Hamano1-5/+28
2023-03-21setup.h: move declarations for setup.c functions from cache.hElijah Newren1-0/+1
2023-03-21environment.h: move declarations for environment.c functions from cache.hElijah Newren1-0/+1
2023-03-21wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren1-0/+1
2023-03-21abspath.h: move absolute path functions from cache.hElijah Newren1-0/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2023-03-17Merge branch 'en/header-cleanup'Junio C Hamano1-0/+2
2023-03-09diff: add --default-prefix optionJeff King1-0/+14
2023-03-09diff: factor out src/dst prefix setupJeff King1-5/+14
2023-02-27Merge branch 'jc/diff-algo-attribute'Junio C Hamano1-23/+67
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2023-02-23alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren1-0/+1
2023-02-21diff: teach diff to read algorithm from diff driverJohn Cai1-9/+24
2023-02-21diff: consolidate diff algorithm option parsingJohn Cai1-14/+43
2023-01-16Merge branch 'jk/ext-diff-with-relative'Junio C Hamano1-17/+13
2023-01-06diff: drop "name" parameter from prepare_temp_file()Jeff King1-11/+10
2023-01-06diff: clean up external-diff argv setupJeff King1-6/+3
2023-01-06diff: use filespec path to set up tempfiles for ext-diffJeff King1-1/+1
2022-12-26Merge branch 'pg/diff-stat-unmerged-regression-fix'Junio C Hamano1-1/+1
2022-12-26Merge branch 'jk/unused-post-2.39'Junio C Hamano1-9/+9
2022-12-19Merge branch 'rs/diff-parseopts'Junio C Hamano1-11/+8
2022-12-15diff: fix regression with --stat and unmerged filePeter Grayson1-1/+1
2022-12-13diff: mark unused parameters in callbacksJeff King1-3/+4
2022-12-13ws: drop unused parameter from ws_blank_line()Jeff King1-6/+5
2022-12-02diff: remove parseopts member from struct diff_optionsRené Scharfe1-14/+1
2022-12-02diff: use add_diff_options() in diff_opt_parse()René Scharfe1-1/+5
2022-12-02diff: factor out add_diff_options()René Scharfe1-0/+6
2022-11-28Merge branch 'sg/plug-line-log-leaks'Junio C Hamano1-8/+9
2022-11-08Merge branch 'rs/no-more-run-command-v'Taylor Blau1-14/+13
2022-11-02diff.c: use diff_free_queue()SZEDER Gábor1-8/+2
2022-11-02line-log: free diff queue when processing non-merge commitsSZEDER Gábor1-0/+7
2022-10-30Merge branch 'jz/patch-id'Taylor Blau1-37/+38
2022-10-30use child_process members "args" and "env" directlyRené Scharfe1-14/+13
2022-10-28Merge branch 'tb/diffstat-with-utf8-strwidth'Junio C Hamano1-11/+31
2022-10-24patch-id: fix patch-id for mode changesJerry Zhang1-0/+5
2022-10-24patch-id: use stable patch-id for rebasesJerry Zhang1-8/+4
2022-10-24patch-id: fix stable patch id for binary / header-onlyJerry Zhang1-29/+29
2022-10-21diff: leave NEEDWORK notes in show_stats() functionJunio C Hamano1-0/+15
2022-10-17diffstat_consume(): assert non-zero lengthJeff King1-0/+3
2022-09-15Merge branch 'en/remerge-diff-fixes'Junio C Hamano1-6/+26
2022-09-14diff.c: use utf8_strwidth() to count display widthTorsten Bögershausen1-11/+16
2022-09-14Merge branch 'ab/unused-annotation'Junio C Hamano1-2/+2
2022-09-14Merge branch 'jk/unused-annotation'Junio C Hamano1-2/+3
2022-09-02diff: fix filtering of merge commits under --remerge-diffElijah Newren1-0/+1
2022-09-02diff: fix filtering of additional headers under --remerge-diffElijah Newren1-0/+2
2022-09-02diff: have submodule_format logic avoid additional diff headersElijah Newren1-6/+23
2022-09-01git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason1-2/+2
2022-08-19hashmap: mark unused callback parametersJeff King1-1/+1
2022-08-19config: mark unused callback parametersJeff King1-1/+2
2022-08-19parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --optionsSZEDER Gábor1-1/+1
2022-07-18Merge branch 'ab/cocci-unused'Junio C Hamano1-2/+0
2022-07-06cocci: add and apply a rule to find "unused" strbufsÆvar Arnfjörð Bjarmason1-2/+0
2022-06-22merge-ort: make `path_messages` a strmap to a string_listJohannes Schindelin1-7/+20
2022-04-20diff: use mks_tempfile_dt()René Scharfe1-7/+1
2022-03-23Merge branch 'ab/plug-random-leaks'Junio C Hamano1-2/+9
2022-03-17diff.c: fix a double-free regression in a18d66cefbÆvar Arnfjörð Bjarmason1-2/+9
2022-03-13Merge branch 'ab/plug-random-leaks'Junio C Hamano1-0/+1
2022-03-06Merge branch 'ac/usage-string-fixups'Junio C Hamano1-1/+1
2022-03-04diff.c: free "buf" in diff_words_flush()Ævar Arnfjörð Bjarmason1-0/+1
2022-02-25Merge branch 'ab/diff-free-more'Junio C Hamano1-0/+2
2022-02-23amend remaining usage strings according to style guideAbhradeep Chakraborty1-1/+1
2022-02-16Merge branch 'js/diff-filter-negation-fix'Junio C Hamano1-53/+44
2022-02-16Merge branch 'en/remerge-diff'Junio C Hamano1-4/+120
2022-02-16diff.[ch]: have diff_free() free options->parseoptsÆvar Arnfjörð Bjarmason1-0/+1
2022-02-16diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec)Ævar Arnfjörð Bjarmason1-0/+1
2022-02-02diff: add ability to insert additional headers for pathsElijah Newren1-4/+120
2022-01-28diff-filter: be more careful when looking for negative bitsJohannes Schindelin1-16/+7
2022-01-28diff.c: move the diff filter bits definitions up a bitJohannes Schindelin1-37/+37
2022-01-10Merge branch 'ja/i18n-similar-messages'Junio C Hamano1-4/+8
2022-01-05Merge branch 'pw/diff-color-moved-fix'Junio C Hamano1-245/+186
2022-01-05i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila1-4/+8
2022-01-05i18n: refactor "%s, %s and %s are mutually exclusive"Jean-Noël Avila1-1/+1
2021-12-09diff --color-moved: intern stringsPhillip Wood1-78/+96
2021-12-09diff: use designated initializers for emitted_diff_symbolPhillip Wood1-1/+3
2021-12-09diff --color-moved-ws=allow-indentation-change: improve hash lookupsPhillip Wood1-46/+19
2021-12-09diff --color-moved: stop clearing potential moved blocksPhillip Wood1-11/+0
2021-12-09diff --color-moved: shrink potential moved blocks as we goPhillip Wood1-36/+8
2021-12-09diff --color-moved: unify moved block growth functionsPhillip Wood1-29/+12
2021-12-09diff --color-moved: call comparison function directlyPhillip Wood1-4/+7
2021-12-09diff --color-moved-ws=allow-indentation-change: simplify and optimizePhillip Wood1-50/+20
2021-12-09diff: simplify allow-indentation-change delta calculationPhillip Wood1-11/+2
2021-12-09diff --color-moved: avoid false short line matches and bad zebra coloringPhillip Wood1-6/+11
2021-12-09diff --color-moved=zebra: fix alternate coloringPhillip Wood1-2/+2
2021-12-09diff --color-moved: rewind when discarding pmbPhillip Wood1-5/+23
2021-12-09diff --color-moved: factor out functionPhillip Wood1-17/+34
2021-12-09diff --color-moved: clear all flags on blocks that are too shortPhillip Wood1-3/+3
2021-11-25run-command API users: use strvec_push(), not argv constructionÆvar Arnfjörð Bjarmason1-6/+2
2021-09-27*.[ch] *_INIT macros: use { 0 } for a "zero out" idiomÆvar Arnfjörð Bjarmason1-2/+2
2021-09-09diff: ignore sparse paths in diffstatDerrick Stolee1-0/+8
2021-08-06Merge branch 'ab/pickaxe-pcre2'Junio C Hamano1-1/+1
2021-08-04diff: --pickaxe-all typofixBagas Sanjaya1-1/+1
2021-07-28Merge branch 'en/rename-limits-doc'Junio C Hamano1-2/+2
2021-07-15rename: bump limit defaults yet againElijah Newren1-1/+1
2021-07-15diff: correct warning message when renameLimit exceededElijah Newren1-1/+1
2021-07-13Merge branch 'ab/pickaxe-pcre2'Junio C Hamano1-14/+25
2021-05-14Merge branch 'pw/word-diff-zero-width-matches'Junio C Hamano1-3/+7
2021-05-11xdiff-interface: replace discard_hunk_line() with a flagÆvar Arnfjörð Bjarmason1-3/+4
2021-05-11xdiff-interface: prepare for allowing early returnÆvar Arnfjörð Bjarmason1-11/+15
2021-05-11pickaxe: die when --find-object and --pickaxe-all are combinedÆvar Arnfjörð Bjarmason1-0/+3
2021-05-11pickaxe: die when -G and --pickaxe-regex are combinedÆvar Arnfjörð Bjarmason1-0/+3
2021-05-05word diff: handle zero length matchesPhillip Wood1-3/+7
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson1-2/+2
2021-04-27Use the final_oid_fn to finalize hashing of object IDsbrian m. carlson1-1/+1
2021-03-13use CALLOC_ARRAYRené Scharfe1-6/+4
2021-02-25Merge branch 'jc/diffcore-rotate'Junio C Hamano1-0/+21
2021-02-16diff: --{rotate,skip}-to=<path>Junio C Hamano1-0/+21
2021-02-11diff: plug memory leak from regcomp() on {log,diff} -IÆvar Arnfjörð Bjarmason1-0/+12
2021-02-11diff: add an API for deferred freeingÆvar Arnfjörð Bjarmason1-4/+16
2021-01-25Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'Junio C Hamano1-0/+3
2020-12-18Merge branch 'jc/diff-I-status-fix'Junio C Hamano1-1/+2
2020-12-16diff: correct interaction between --exit-code and -I<pattern>Junio C Hamano1-1/+2
2020-12-08diff: do not show submodule with untracked files as "-dirty"Sangeeta Jain1-0/+3
2020-11-21Merge branch 'en/strmap'Junio C Hamano1-2/+2
2020-11-21Merge branch 'jk/diff-release-filespec-fix'Junio C Hamano1-0/+3
2020-11-06diff: allow passing NULL to diff_free_filespec_data()Jinoh Kang1-0/+3
2020-11-02Merge branch 'mk/diff-ignore-regex'Junio C Hamano1-0/+23
2020-11-02hashmap: provide deallocation function namesElijah Newren1-2/+2
2020-10-20diff: add -I<regex> that ignores matching changesMichał Kępień1-0/+23
2020-09-24diff: fix modified lines stats with --stat and --numstatThomas Guyot-Sionnest1-5/+7
2020-09-18Merge branch 'jc/quote-path-cleanup'Junio C Hamano1-4/+4
2020-09-10quote: turn 'nodq' parameter into a set of flagsJunio C Hamano1-4/+4
2020-09-09Merge branch 'ss/submodule-summary-in-c'Junio C Hamano1-1/+1
2020-09-03Merge branch 'mr/diff-hide-stat-wo-textual-change'Junio C Hamano1-7/+31
2020-08-31Merge branch 'dd/diff-customize-index-line-abbrev'Junio C Hamano1-1/+4
2020-08-24Merge branch 'rs/patch-id-with-incomplete-line'Junio C Hamano1-0/+2
2020-08-21diff: index-line: respect --abbrev in object's nameĐoàn Trần Công Danh1-1/+4
2020-08-19diff: teach --stat to ignore uninteresting modificationsMatthew Rogers1-7/+31
2020-08-18patch-id: ignore newline at end of file in diff_flush_patch_id()René Scharfe1-0/+2
2020-08-12submodule: rename helper functions to avoid ambiguityShourya Shukla1-1/+1
2020-07-30strvec: rename struct fieldsJeff King1-1/+1
2020-07-28strvec: convert more callers away from argv_array nameJeff King1-14/+14
2020-07-28strvec: rename files from argv-array to strvecJeff King1-1/+1
2020-06-17Merge branch 'jk/diff-memuse-optim-with-stat-unmatch'Junio C Hamano1-1/+4
2020-06-02diff: discard blob data from stat-unmatched pairsJeff King1-1/+4
2020-05-24diff: add config option relativeLaurent Arnoud1-3/+8
2020-04-28Merge branch 'jt/avoid-prefetch-when-able-in-diff'Junio C Hamano1-50/+107
2020-04-07diff: restrict when prefetching occursJonathan Tan1-22/+51
2020-04-07diff: refactor object readJonathan Tan1-8/+21
2020-04-07diff: make diff_populate_filespec_options structJonathan Tan1-19/+35
2020-04-02promisor-remote: accept 0 as oid_nr in functionJonathan Tan1-6/+5
2020-03-16convert: provide additional metadata to filtersbrian m. carlson1-1/+4
2020-03-16convert: permit passing additional metadata to filter processesbrian m. carlson1-1/+1
2020-02-14Merge branch 'mt/use-passed-repo-more-in-funcs'Junio C Hamano1-1/+1
2020-01-31diff: move diff.wsErrorHighlight to "basic" configJeff King1-8/+8
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 08:57:28 +0000