aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
4 daysMerge branch 'rs/diff-index-find-copies-harder-optim'Junio C Hamano1-0/+20
2025-11-30Merge branch 'jc/whitespace-incomplete-line'Junio C Hamano1-47/+98
2025-11-30diff-index: don't queue unchanged filepairs with diff_change()René Scharfe1-0/+20
2025-11-26Merge branch 'ad/blame-diff-algorithm'Junio C Hamano1-1/+0
2025-11-21Merge branch 'rs/diff-quiet-no-rename'Junio C Hamano1-0/+2
2025-11-17xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASKAntonin Delpeuch1-1/+0
2025-11-12diff: highlight and error out on incomplete linesJunio C Hamano1-2/+27
2025-11-12whitespace: allocate a few more bits and define WS_INCOMPLETE_LINEJunio C Hamano1-8/+8
2025-11-12diff: update the way rewrite diff handles incomplete linesJunio C Hamano1-15/+22
2025-11-12diff: call emit_callback ecbdata everywhereJunio C Hamano1-6/+6
2025-11-12diff: refactor output of incomplete lineJunio C Hamano1-2/+12
2025-11-12diff: keep track of the type of the last line seenJunio C Hamano1-0/+11
2025-11-12diff: correct suppress_blank_empty hackJunio C Hamano1-16/+11
2025-11-12diff: emit_line_ws_markup() if/else style fixJunio C Hamano1-4/+4
2025-11-12whitespace: correct bit assignment commentsJunio C Hamano1-2/+5
2025-11-10diff: disable rename detection with --quietRené Scharfe1-0/+2
2025-10-24diff: simplify run_external_diff() quiet logicJeff King1-3/+2
2025-10-24diff: drop dry-run redirection to /dev/nullJeff King1-28/+3
2025-10-24diff: replace diff_options.dry_run flag with NULL fileJeff King1-8/+8
2025-10-24diff: drop save/restore of color_moved in dry-run modeJeff King1-4/+0
2025-10-24diff: send external diff output to diff_options.fileJeff King1-1/+4
2025-10-24Merge branch 'jc/diff-from-contents-fix'Junio C Hamano1-3/+23
2025-10-24Merge branch 'jk/diff-from-contents-fix'Junio C Hamano1-0/+9
2025-10-23diff: stop output garbled message in dry run modeLidong Yan1-2/+6
2025-10-23Merge branch 'jc/diff-from-contents-fix' into ly/diff-name-only-with-diff-fro...Junio C Hamano1-3/+23
2025-10-23diff: make sure the other caller of diff_flush_patch_quietly() is silentJunio C Hamano1-3/+23
2025-10-22Merge branch 'jk/diff-from-contents-fix' into ly/diff-name-only-with-diff-fro...Junio C Hamano1-0/+9
2025-10-17diff: restore redirection to /dev/null for diff_from_contentsJeff King1-0/+9
2025-09-29Merge branch 'jk/color-variable-fixes'Junio C Hamano1-26/+22
2025-09-16color: use git_colorbool enum type to store colorboolsJeff King1-3/+3
2025-09-16diff: stop passing ecbdata->use_color as booleanJeff King1-3/+3
2025-09-16diff: pass o->use_color directly to fill_metainfo()Jeff King1-1/+1
2025-09-16diff: don't use diff_options.use_color as a strict boolJeff King1-3/+2
2025-09-16diff: simplify color_moved check when flushingJeff King1-14/+11
2025-09-16color: use GIT_COLOR_* instead of numeric constantsJeff King1-3/+3
2025-08-25Merge branch 'tc/diff-tree-max-depth'Junio C Hamano1-0/+24
2025-08-22Merge branch 'ly/diff-name-only-with-diff-from-content'Junio C Hamano1-14/+50
2025-08-08diff: ensure consistent diff behavior with ignore optionsLidong Yan1-14/+50
2025-08-07diff: teach tree-diff a max-depth parameterJeff King1-0/+24
2025-08-02diff: simplify parsing of diff.colormovedwsJunio C Hamano1-13/+7
2025-08-02string-list: align string_list_split() with its _in_place() counterpartJunio C Hamano1-1/+1
2025-07-01odb: rename `oid_object_info()`Patrick Steinhardt1-9/+9
2025-07-01object-store: rename files to "odb.{c,h}"Patrick Steinhardt1-1/+1
2025-05-08Merge branch 'js/diff-codeql-false-positive-workaround'Junio C Hamano1-1/+1
2025-04-29diff: check range before dereferencing an array elementJohannes Schindelin1-1/+1
2025-04-24Merge branch 'ps/parse-options-integers'Junio C Hamano1-4/+9
2025-04-17global: use designated initializers for optionsPatrick Steinhardt1-4/+9
2025-04-15object-store: merge "object-store-ll.h" and "object-store.h"Patrick Steinhardt1-1/+1
2025-04-08Merge branch 'ps/object-wo-the-repository' into ps/object-file-cleanupJunio C Hamano1-6/+8
2025-03-10hash: stop depending on `the_repository` in `null_oid()`Patrick Steinhardt1-4/+4
2025-03-10environment: move access to "core.bigFileThreshold" into repo settingsPatrick Steinhardt1-2/+4
2025-03-03diff: add option to skip resolving diff statusesJustin Tobler1-1/+1
2025-03-03diff: return diff_filepair from diff queue helpersJustin Tobler1-20/+50
2025-02-25Merge branch 'bc/diff-reject-empty-arg-to-pickaxe'Junio C Hamano1-0/+4
2025-02-18diff: don't crash with empty argument to -G or -Sbrian m. carlson1-0/+4
2025-01-31global: adapt callers to use generic hash context helpersPatrick Steinhardt1-12/+12
2025-01-31hash: stop typedeffing the hash contextPatrick Steinhardt1-5/+5
2024-12-23Merge branch 'ps/build-sign-compare'Junio C Hamano1-0/+1
2024-12-18pager: stop using `the_repository`Patrick Steinhardt1-2/+2
2024-12-18Merge branch 'ps/build-sign-compare' into ps/the-repositoryJunio C Hamano1-0/+1
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt1-0/+1
2024-12-04packfile: pass down repository to `has_object[_kept]_pack`Karthik Nayak1-1/+2
2024-10-10Merge branch 'jk/output-prefix-cleanup'Junio C Hamano1-7/+3
2024-10-03diff: return const char from output_prefix callbackJeff King1-6/+3
2024-10-03diff: drop line_prefix_length fieldJeff King1-1/+0
2024-09-30diff: improve lifecycle management of diff queuesPatrick Steinhardt1-10/+12
2024-09-30Merge branch 'ps/leakfixes-part-7' into ps/leakfixes-part-8Junio C Hamano1-2/+5
2024-09-27diff: fix leaking orderfile optionPatrick Steinhardt1-2/+5
2024-09-25Merge branch 'rs/diff-exit-code-binary'Junio C Hamano1-0/+1
2024-09-23diff: report modified binary files as changes in builtin_diff()René Scharfe1-0/+1
2024-09-16Merge branch 'jc/range-diff-lazy-setup'Junio C Hamano1-1/+9
2024-09-13Merge branch 'rs/diff-exit-code-fix'Junio C Hamano1-0/+5
2024-09-08diff: report dirty submodules as changes in builtin_diff()René Scharfe1-0/+2
2024-09-08diff: report copies and renames as changes in run_diff_cmd()René Scharfe1-0/+3
2024-08-14diff: free state populated via optionsPatrick Steinhardt1-0/+10
2024-08-14diff: fix leak when parsing invalid ignore regex optionPatrick Steinhardt1-1/+5
2024-08-09remerge-diff: clean up temporary objdir at a central placeJunio C Hamano1-1/+9
2024-07-08Merge branch 'ps/leakfixes-more'Junio C Hamano1-2/+6
2024-07-02Merge branch 'rs/diff-color-moved-w-no-ext-diff-fix'Junio C Hamano1-1/+2
2024-07-02Merge branch 'ps/use-the-repository'Junio C Hamano1-3/+6
2024-06-24diff: allow --color-moved with --no-ext-diffRené Scharfe1-1/+2
2024-06-20Merge branch 'rs/diff-exit-code-with-external-diff'Junio C Hamano1-16/+52
2024-06-14global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt1-0/+3
2024-06-14hash: require hash algorithm in `oidread()` and `oidclr()`Patrick Steinhardt1-3/+3
2024-06-11revision: free diff optionsPatrick Steinhardt1-2/+6
2024-06-10diff: let external diffs report that changes are uninterestingRené Scharfe1-1/+35
2024-06-10userdiff: add and use struct external_diffRené Scharfe1-15/+17
2024-06-07diff: cast string constant in `fill_textconv()`Patrick Steinhardt1-1/+1
2024-06-07global: improve const correctness when assigning string constantsPatrick Steinhardt1-2/+2
2024-05-27config: clarify memory ownership in `git_config_string()`Patrick Steinhardt1-4/+4
2024-05-27diff: refactor code to clarify memory ownership of prefixesPatrick Steinhardt1-8/+10
2024-05-27config: clarify memory ownership in `git_config_pathname()`Patrick Steinhardt1-1/+1
2024-05-16Merge branch 'rs/external-diff-with-exit-code'Junio C Hamano1-30/+3
2024-05-16Revert "diff: fix --exit-code with external diff"Junio C Hamano1-30/+3
2024-05-15Merge branch 'rs/external-diff-with-exit-code'Junio C Hamano1-3/+31
2024-05-06diff: fix --exit-code with external diffRené Scharfe1-3/+30
2024-05-06diff: report unmerged paths as changes in run_diff_cmd()René Scharfe1-0/+1
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-13Merge branch 'jk/diff-external-with-no-index' into maint-2.43Junio C Hamano1-1/+2
2024-02-08Merge branch 'en/header-cleanup' into maint-2.43Junio C Hamano1-2/+0
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
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-18 07:48:15 +0000