summaryrefslogtreecommitdiff
path: root/merge-ort.c
AgeCommit message (Expand)AuthorFilesLines
2021-04-30Merge branch 'ds/sparse-index-protections'Libravatar Junio C Hamano1-1/+1
2021-04-27hash: provide per-algorithm null OIDsLibravatar brian m. carlson1-10/+10
2021-04-16Merge branch 'ah/merge-ort-ubsan-fix'Libravatar Junio C Hamano1-14/+6
2021-04-16Merge branch 'en/ort-readiness'Libravatar Junio C Hamano1-28/+215
2021-04-16Merge branch 'en/ort-perf-batch-10'Libravatar Junio C Hamano1-18/+61
2021-04-12merge-ort: only do pointer arithmetic for non-empty listsLibravatar Andrzej Hunt1-13/+5
2021-04-08Merge branch 'en/ort-perf-batch-9'Libravatar Junio C Hamano1-4/+230
2021-03-22Merge branch 'en/ort-perf-batch-8'Libravatar Junio C Hamano1-138/+6
2021-03-20Revert "merge-ort: ignore the directory rename split conflict for now"Libravatar Elijah Newren1-12/+1
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictLibravatar Elijah Newren1-0/+10
2021-03-20merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entriesLibravatar Elijah Newren1-13/+30
2021-03-20merge-ort: support subtree shiftingLibravatar Elijah Newren1-0/+24
2021-03-20merge-ort: let renormalization change modify/delete into clean deleteLibravatar Elijah Newren1-2/+62
2021-03-20merge-ort: have ll_merge() use a special attr_index for renormalizationLibravatar Elijah Newren1-2/+62
2021-03-20merge-ort: add a special minimal index just for renormalizationLibravatar Elijah Newren1-0/+20
2021-03-20merge-ort: use STABLE_QSORT instead of QSORT where requiredLibravatar Elijah Newren1-1/+7
2021-03-18merge-ort: record the reason that we want a rename for a fileLibravatar Elijah Newren1-5/+10
2021-03-18diffcore-rename: add computation of number of unknown renamesLibravatar Elijah Newren1-0/+3
2021-03-18merge-ort: record the reason that we want a rename for a directoryLibravatar Elijah Newren1-3/+38
2021-03-18merge-ort, diffcore-rename: tweak dirs_removed and relevant_source typeLibravatar Elijah Newren1-14/+14
2021-03-13use CALLOC_ARRAYLibravatar René Scharfe1-5/+4
2021-03-10merge-ort: skip rename detection entirely if possibleLibravatar Elijah Newren1-0/+44
2021-03-10merge-ort: use relevant_sources to filter possible rename sourcesLibravatar Elijah Newren1-1/+1
2021-03-10merge-ort: precompute whether directory rename detection is neededLibravatar Elijah Newren1-6/+61
2021-03-10merge-ort: introduce wrappers for alternate tree traversalLibravatar Elijah Newren1-0/+71
2021-03-10merge-ort: add data structures for an alternate tree traversalLibravatar Elijah Newren1-0/+26
2021-03-10merge-ort: precompute subset of sources for which we need rename detectionLibravatar Elijah Newren1-3/+32
2021-03-10diffcore-rename: enable filtering possible rename sourcesLibravatar Elijah Newren1-0/+1
2021-02-26diffcore-rename: add function for clearing dir_rename_countLibravatar Elijah Newren1-9/+3
2021-02-26Move computation of dir_rename_count from merge-ort to diffcore-renameLibravatar Elijah Newren1-129/+3
2021-02-15merge-ort: call diffcore_rename() directlyLibravatar Elijah Newren1-7/+59
2021-01-23merge-ort: begin performance work; instrument with trace2_region_* callsLibravatar Elijah Newren1-0/+57
2021-01-23merge-ort: ignore the directory rename split conflict for nowLibravatar Elijah Newren1-1/+12
2021-01-23merge-ort: fix massive leakLibravatar Elijah Newren1-0/+17
2021-01-20Merge branch 'en/ort-directory-rename' into en/merge-ort-perfLibravatar Junio C Hamano1-22/+1228
2021-01-20merge-ort: fix a directory rename detection bugLibravatar Elijah Newren1-117/+81
2021-01-20merge-ort: process_renames() now needs more defensivenessLibravatar Elijah Newren1-5/+21
2021-01-20merge-ort: implement apply_directory_rename_modifications()Libravatar Elijah Newren1-1/+167
2021-01-20merge-ort: add a new toplevel_dir fieldLibravatar Elijah Newren1-6/+9
2021-01-20merge-ort: implement handle_path_level_conflicts()Libravatar Elijah Newren1-1/+71
2021-01-20merge-ort: implement check_for_directory_rename()Libravatar Elijah Newren1-1/+66
2021-01-20merge-ort: implement apply_dir_rename() and check_dir_renamed()Libravatar Elijah Newren1-2/+35
2021-01-20merge-ort: implement compute_collisions()Libravatar Elijah Newren1-1/+67
2021-01-20merge-ort: modify collect_renames() for directory rename handlingLibravatar Elijah Newren1-4/+74
2021-01-20merge-ort: implement handle_directory_level_conflicts()Libravatar Elijah Newren1-1/+18
2021-01-20merge-ort: implement compute_rename_counts()Libravatar Elijah Newren1-2/+52
2021-01-20merge-ort: copy get_renamed_dir_portion() from merge-recursive.cLibravatar Elijah Newren1-0/+104
2021-01-20merge-ort: add outline of get_provisional_directory_renames()Libravatar Elijah Newren1-1/+56
2021-01-20merge-ort: add outline for computing directory renamesLibravatar Elijah Newren1-1/+24
2021-01-14Merge branch 'en/ort-conflict-handling' into en/merge-ort-perfLibravatar Junio C Hamano1-18/+653
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 03:51:23 +0000