aboutsummaryrefslogtreecommitdiffstats
path: root/merge-ort.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-08-21Merge branch 'en/ort-rename-fixes'Junio C Hamano1-15/+40
2025-08-07merge-ort: fix directory rename on top of source of other rename/deleteElijah Newren1-5/+13
2025-08-07merge-ort: fix incorrect file handlingElijah Newren1-0/+14
2025-08-07merge-ort: clarify the interning of strings in opt->priv->pathElijah Newren1-3/+8
2025-08-07merge-ort: drop unnecessary temporary in check_for_directory_rename()Elijah Newren1-4/+2
2025-08-07merge-ort: update comments to modern testfile locationElijah Newren1-3/+3
2025-08-05Merge branch 'ps/object-file-wo-the-repository'Junio C Hamano1-3/+4
2025-07-23config: drop `git_config_get_bool()` wrapperPatrick Steinhardt1-1/+1
2025-07-23config: drop `git_config_get_int()` wrapperPatrick Steinhardt1-3/+3
2025-07-23config: drop `git_config_get_string()` wrapperPatrick Steinhardt1-4/+4
2025-07-23config: drop `git_config()` wrapperPatrick Steinhardt1-1/+1
2025-07-16odb: introduce `odb_write_object()`Patrick Steinhardt1-3/+4
2025-07-01odb: rename `repo_read_object_file()`Patrick Steinhardt1-1/+1
2025-07-01odb: rename `oid_object_info()`Patrick Steinhardt1-2/+2
2025-07-01object-store: rename files to "odb.{c,h}"Patrick Steinhardt1-1/+1
2025-05-16merge-ort: add a new mergeability_only optionElijah Newren1-7/+31
2025-04-24Merge branch 'ps/object-file-cleanup'Junio C Hamano1-1/+2
2025-04-17Merge branch 'en/merge-recursive-debug'Junio C Hamano1-3/+159
2025-04-15Merge branch 'ps/object-wo-the-repository'Junio C Hamano1-13/+13
2025-04-15object-file: split out functions relating to object store subsystemPatrick Steinhardt1-1/+2
2025-04-08Merge branch 'ps/object-wo-the-repository' into ps/object-file-cleanupJunio C Hamano1-13/+13
2025-04-08merge-recursive.[ch]: thoroughly debug theseElijah Newren1-0/+159
2025-04-08merge-ort: enable diff-algorithms other than histogramElijah Newren1-3/+0
2025-04-08Merge branch 'en/assert-wo-side-effects'Junio C Hamano1-2/+2
2025-03-29Merge branch 'en/random-cleanups'Junio C Hamano1-5/+5
2025-03-29Merge branch 'en/merge-ort-prepare-to-remove-recursive'Junio C Hamano1-7/+46
2025-03-21treewide: replace assert() with ASSERT() in special casesElijah Newren1-2/+2
2025-03-18merge-ort: fix merge.directoryRenames=falseElijah Newren1-2/+29
2025-03-18merge-ort: allow rename detection to be disabledElijah Newren1-0/+5
2025-03-18merge-ort: add new merge_ort_generic() functionElijah Newren1-5/+12
2025-03-17merge-ort: remove extraneous word in commentElijah Newren1-3/+3
2025-03-17merge-ort: fix accidental strset<->strintmapElijah Newren1-2/+2
2025-03-10hash: stop depending on `the_repository` in `null_oid()`Patrick Steinhardt1-13/+13
2025-03-06merge-ort: fix slightly overzealous assertion for rename-to-selfElijah Newren1-1/+2
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt1-0/+1
2024-09-30diff: improve lifecycle management of diff queuesPatrick Steinhardt1-1/+1
2024-09-25Merge branch 'ak/typofix-2.46-maint'Junio C Hamano1-2/+2
2024-09-19merge-ort: fix typosAndrew Kreimer1-2/+2
2024-09-05merge-ort: fix two leaks when handling directory rename modificationsPatrick Steinhardt1-1/+3
2024-08-14merge-ort: unconditionally release attributes indexPatrick Steinhardt1-2/+1
2024-07-16Merge branch 'en/ort-inner-merge-error-fix'Junio C Hamano1-45/+124
2024-07-08Merge branch 'ps/leakfixes-more'Junio C Hamano1-4/+8
2024-07-06merge-ort: fix missing early returnElijah Newren1-0/+1
2024-06-20merge-ort: convert more error() cases to path_msg()Elijah Newren1-12/+41
2024-06-20merge-ort: upon merge abort, only show messages causing the abortElijah Newren1-25/+53
2024-06-20merge-ort: loosen commented requirementsElijah Newren1-1/+1
2024-06-20merge-ort: clearer propagation of failure-to-function from merge_submoduleElijah Newren1-0/+2
2024-06-20merge-ort: fix type of local 'clean' var in handle_content_merge ()Elijah Newren1-2/+3
2024-06-20merge-ort: maintain expected invariant for priv memberElijah Newren1-1/+2
2024-06-20merge-ort: extract handling of priv member into reusable functionElijah Newren1-5/+22
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-12 02:42:29 +0000