aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/difftool.c
AgeCommit message (Expand)AuthorFilesLines
2025-07-01odb: rename `repo_read_object_file()`Patrick Steinhardt1-1/+1
2025-07-01object-store: rename files to "odb.{c,h}"Patrick Steinhardt1-1/+1
2025-04-29Merge branch 'ua/call-repo-config-with-possibly-null-repository'Junio C Hamano1-2/+1
2025-04-20builtin/difftool: remove unnecessary if statementUsman Akinyemi1-2/+1
2025-04-15object-store: merge "object-store-ll.h" and "object-store.h"Patrick Steinhardt1-1/+1
2025-04-15object-file: move `safe_create_leading_directories()` into "path.c"Patrick Steinhardt1-13/+16
2025-02-06difftool: eliminate use of USE_THE_REPOSITORY_VARIABLEDavid Aguilar1-2/+0
2025-02-06difftool: eliminate use of the_repositoryDavid Aguilar1-25/+29
2025-02-06difftool: eliminate use of global variablesDavid Aguilar1-18/+33
2024-12-06global: trivial conversions to fix `-Wsign-compare` warningsPatrick Steinhardt1-2/+2
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt1-0/+3
2024-11-13builtin/difftool: intialize some hashmap variablesSimon Marchi1-4/+2
2024-10-21global: Fix duplicate word typosSven Strickroth1-1/+1
2024-10-02Merge branch 'ps/leakfixes-part-7'Junio C Hamano1-0/+6
2024-09-27builtin/difftool: plug several trivial memory leaksPatrick Steinhardt1-0/+6
2024-09-23Merge branch 'jc/pass-repo-to-builtins'Junio C Hamano1-2/+6
2024-09-13builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.hJohn Cai1-1/+2
2024-09-13builtin: add a repository parameter for builtin functionsJohn Cai1-1/+4
2024-09-12environment: make `get_git_work_tree()` accept a repositoryPatrick Steinhardt1-2/+2
2024-09-12environment: make `get_git_dir()` accept a repositoryPatrick Steinhardt1-2/+3
2024-07-08Merge branch 'ps/leakfixes-more'Junio C Hamano1-0/+3
2024-06-11builtin/difftool: plug memory leaks in `run_dir_diff()`Patrick Steinhardt1-0/+3
2024-06-06Merge branch 'rs/difftool-env-simplify'Junio C Hamano1-8/+4
2024-05-27difftool: add env vars directly in run_file_diff()René Scharfe1-8/+4
2024-04-18builtin: stop using `the_index`Patrick Steinhardt1-2/+2
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-1/+0
2023-07-17Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano1-1/+0
2023-07-06Merge branch 'gc/config-context'Junio C Hamano1-2/+3
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan1-1/+0
2023-06-28config: add ctx arg to config_fn_tGlen Choo1-2/+3
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren1-1/+1
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-2/+1
2023-06-21read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren1-0/+1
2023-06-21sparse-index.h: move declarations for sparse-index.c from cache.hElijah Newren1-0/+1
2023-05-09Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano1-0/+1
2023-04-25Merge branch 'en/header-split-cache-h'Junio C Hamano1-0/+1
2023-04-24copy.h: move declarations for copy.c functions from cache.hElijah Newren1-0/+1
2023-04-17Merge branch 'tk/mergetool-gui-default-config'Junio C Hamano1-4/+12
2023-04-11object-file.h: move declarations for object-file.c functions from cache.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-1/+2
2023-04-05mergetool: new config guiDefault supports auto-toggling gui by DISPLAYTao Klerks1-4/+12
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-1/+2
2023-03-28cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+2
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-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2023-01-17treewide: always have a valid "index_state.repo" memberÆvar Arnfjörð Bjarmason1-1/+1
2023-01-16cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()Ævar Arnfjörð Bjarmason1-1/+1
2023-01-13builtin/difftool.c: { 0 }-initialize rather than using memset()Ævar Arnfjörð Bjarmason1-3/+1
2022-11-21{builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"Ævar Arnfjörð Bjarmason1-1/+1
2022-10-30replace and remove run_command_v_opt()René Scharfe1-2/+5
2022-10-30use child_process member "args" instead of string array variableRené Scharfe1-8/+9
2022-09-14Merge branch 'ab/unused-annotation'Junio C Hamano1-5/+5
2022-09-14Merge branch 'jk/unused-annotation'Junio C Hamano1-5/+5
2022-09-01git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason1-5/+5
2022-08-19hashmap: mark unused callback parametersJeff King1-5/+5
2022-08-19parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --optionsSZEDER Gábor1-1/+1
2022-06-02run-command API: rename "env_array" to "env"Ævar Arnfjörð Bjarmason1-3/+3
2022-02-04i18n: factorize more 'incompatible options' messagesJean-Noël Avila1-2/+3
2022-01-05i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila1-1/+1
2022-01-05i18n: refactor "%s, %s and %s are mutually exclusive"Jean-Noël Avila1-1/+1
2021-11-25difftool: use "env_array" to simplify memory managementÆvar Arnfjörð Bjarmason1-10/+4
2021-10-11Merge branch 'da/difftool'Junio C Hamano1-51/+53
2021-10-03Merge branch 'bs/difftool-msg-tweak'Junio C Hamano1-3/+3
2021-10-03Merge branch 'da/difftool-dir-diff-symlink-fix'Junio C Hamano1-0/+2
2021-09-30difftool: add a missing space to the run_dir_diff() commentsDavid Aguilar1-1/+1
2021-09-30difftool: remove an unnecessary call to strbuf_release()David Aguilar1-2/+0
2021-09-30difftool: refactor dir-diff to write files using helper functionsDavid Aguilar1-22/+28
2021-09-30difftool: create a tmpdir path without repeated slashesDavid Aguilar1-26/+24
2021-09-23Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftoolJunio C Hamano1-0/+2
2021-09-23difftool: fix symlink-file writing in dir-diff modeDavid Aguilar1-0/+2
2021-09-22difftool: fix word spacing in the usage stringsBagas Sanjaya1-3/+3
2021-09-12parse-options API: remove OPTION_ARGUMENT featureÆvar Arnfjörð Bjarmason1-1/+3
2021-09-12difftool: use run_command() API in run_file_diff()Ævar Arnfjörð Bjarmason1-7/+6
2021-09-12difftool: prepare "diff" cmdline in cmd_difftool()Jeff King1-8/+7
2021-09-12difftool: prepare "struct child_process" in cmd_difftool()Ævar Arnfjörð Bjarmason1-14/+15
2021-07-08Merge branch 'ab/cmd-foo-should-return'Junio C Hamano1-3/+2
2021-06-09builtins + test helpers: use return instead of exit() in cmd_*Ævar Arnfjörð Bjarmason1-3/+2
2021-05-16Merge branch 'mt/parallel-checkout-part-3'Junio C Hamano1-1/+1
2021-05-05make_transient_cache_entry(): optionally alloc from mem_poolMatheus Tavares1-1/+1
2021-04-30Merge branch 'ds/sparse-index-protections'Junio C Hamano1-0/+3
2021-04-14difftool: ensure full indexDerrick Stolee1-0/+3
2021-03-23entry: extract a header file for entry.c functionsMatheus Tavares1-0/+1
2020-11-11Use new HASHMAP_INIT macro to simplify hashmap initializationElijah Newren1-5/+4
2020-07-30strvec: rename struct fieldsJeff King1-1/+1
2020-07-28strvec: fix indentation in renamed callsJeff King1-6/+6
2020-07-28strvec: convert builtin/ callers away from argv_array nameJeff King1-7/+7
2020-07-28strvec: rename files from argv-array to strvecJeff King1-1/+1
2019-10-07hashmap: remove type arg from hashmap_{get,put,remove}_entryEric Wong1-1/+1
2019-10-07OFFSETOF_VAR macro to simplify hashmap iteratorsEric Wong1-2/+2
2019-10-07hashmap: use *_entry APIs for iterationEric Wong1-4/+4
2019-10-07hashmap_cmp_fn takes hashmap_entry paramsEric Wong1-12/+19
2019-10-07hashmap_get{,_from_hash} return "struct hashmap_entry *"Eric Wong1-1/+1
2019-10-07hashmap_get takes "const struct hashmap_entry *"Eric Wong1-2/+3
2019-10-07hashmap_add takes "struct hashmap_entry *"Eric Wong1-3/+3
2019-10-07hashmap_entry_init takes "struct hashmap_entry *"Eric Wong1-3/+3
2019-05-19Merge branch 'js/difftool-no-index'Junio C Hamano1-1/+2
2019-05-19Merge branch 'dl/difftool-mergetool'Junio C Hamano1-8/+5
2019-05-13difftool: fallback on merge.guitoolDenton Liu1-8/+2
2019-05-13difftool: make --gui, --tool and --extcmd mutually exclusiveDenton Liu1-0/+3
2019-05-09difftool --no-index: error out on --dir-diff (and don't crash)Johannes Schindelin1-1/+2
2019-04-25Merge branch 'bc/hash-transition-16'Junio C Hamano1-6/+4
2019-04-01builtin/difftool: use parse_oid_hexbrian m. carlson1-6/+4
2019-03-18difftool: allow running outside Git worktrees with --no-indexJohannes Schindelin1-3/+10
2019-03-18difftool: remove obsolete (and misleading) commentJohannes Schindelin1-1/+0
2019-02-06Merge branch 'nd/the-index-final'Junio C Hamano1-0/+1
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy1-0/+1
2018-11-14checkout: print something when checking out pathsNguyễn Thái Ngọc Duy1-1/+1
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-1/+1
2018-09-21sha1-file.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-2/+2
2018-08-17Merge branch 'rs/parse-opt-lithelp'Junio C Hamano1-2/+2
2018-08-03difftool: remove angular brackets from argument helpRené Scharfe1-2/+2
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano1-3/+3
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano1-0/+1
2018-07-03block alloc: add lifecycle APIs for cache_entry structsJameson Miller1-3/+3
2018-07-03read-cache: teach make_cache_entry to take object_idJameson Miller1-2/+2
2018-06-01Merge branch 'nd/use-opt-int-set-f'Junio C Hamano1-5/+4
2018-05-30Merge branch 'ma/lockfile-cleanup'Junio C Hamano1-1/+1
2018-05-24Use OPT_SET_INT_F() for cmdline option specificationNguyễn Thái Ngọc Duy1-5/+4
2018-05-16object-store: move object access functions to object-store.hStefan Beller1-0/+1
2018-05-10lock_file: make function-local locks non-staticMartin Ågren1-1/+1
2018-04-11exec_cmd: rename to use dash in file nameStefan Beller1-1/+1
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson1-1/+1
2017-10-07read-cache: leave lock in right state in `write_locked_index()`Martin Ågren1-1/+0
2017-08-20sha1_file: convert index_fd to struct object_idPatryk Obara1-1/+1
2017-07-05builtin/difftool.c: drop hashmap_cmp_fn castStefan Beller1-15/+22
2017-06-30hashmap.h: compare function has access to a data fieldStefan Beller1-9/+15
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-05-08difftool: address a couple of resource/memory leaksJohannes Schindelin1-10/+23
2017-04-13difftool: fix use-after-freeJohannes Schindelin1-2/+5
2017-03-30difftool: avoid strcpyJeff King1-16/+15
2017-03-15difftool: handle modified symlinks in dir-diff modeDavid Aguilar1-5/+46
2017-02-06difftool: fix bug when printing usageDavid Aguilar1-4/+4
2017-01-25difftool: hack around -Wzero-length-format warningJeff King1-1/+1
2017-01-19difftool: retire the scripted versionJohannes Schindelin1-41/+0
2017-01-19difftool: implement the functionality in the builtinJohannes Schindelin1-1/+671
2017-01-17difftool: add a skeleton for the upcoming builtinJohannes Schindelin1-0/+63
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-07 02:34:13 +0000