summaryrefslogtreecommitdiff
path: root/merge-ort.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ah/merge-ort-ubsan-fix'Junio C Hamano2021-04-161-14/+6
|\
| * merge-ort: only do pointer arithmetic for non-empty listsAndrzej Hunt2021-04-121-13/+5
* | Merge branch 'en/ort-readiness'Junio C Hamano2021-04-161-28/+215
|\ \
| * | Revert "merge-ort: ignore the directory rename split conflict for now"Elijah Newren2021-03-201-12/+1
| * | merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren2021-03-201-0/+10
| * | merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entriesElijah Newren2021-03-201-13/+30
| * | merge-ort: support subtree shiftingElijah Newren2021-03-201-0/+24
| * | merge-ort: let renormalization change modify/delete into clean deleteElijah Newren2021-03-201-2/+62
| * | merge-ort: have ll_merge() use a special attr_index for renormalizationElijah Newren2021-03-201-2/+62
| * | merge-ort: add a special minimal index just for renormalizationElijah Newren2021-03-201-0/+20
| * | merge-ort: use STABLE_QSORT instead of QSORT where requiredElijah Newren2021-03-201-1/+7
* | | Merge branch 'en/ort-perf-batch-10'Junio C Hamano2021-04-161-18/+61
|\ \ \ | |/ / | | / | |/ |/|
| * merge-ort: record the reason that we want a rename for a fileElijah Newren2021-03-181-5/+10
| * diffcore-rename: add computation of number of unknown renamesElijah Newren2021-03-181-0/+3
| * merge-ort: record the reason that we want a rename for a directoryElijah Newren2021-03-181-3/+38
| * merge-ort, diffcore-rename: tweak dirs_removed and relevant_source typeElijah Newren2021-03-181-14/+14
* | Merge branch 'en/ort-perf-batch-9'Junio C Hamano2021-04-081-4/+230
|\ \ | |/
| * merge-ort: skip rename detection entirely if possibleElijah Newren2021-03-101-0/+44
| * merge-ort: use relevant_sources to filter possible rename sourcesElijah Newren2021-03-101-1/+1
| * merge-ort: precompute whether directory rename detection is neededElijah Newren2021-03-101-6/+61
| * merge-ort: introduce wrappers for alternate tree traversalElijah Newren2021-03-101-0/+71
| * merge-ort: add data structures for an alternate tree traversalElijah Newren2021-03-101-0/+26
| * merge-ort: precompute subset of sources for which we need rename detectionElijah Newren2021-03-101-3/+32
| * diffcore-rename: enable filtering possible rename sourcesElijah Newren2021-03-101-0/+1
* | Merge branch 'en/ort-perf-batch-8'Junio C Hamano2021-03-221-138/+6
|\ \ | |/
| * diffcore-rename: add function for clearing dir_rename_countElijah Newren2021-02-261-9/+3
| * Move computation of dir_rename_count from merge-ort to diffcore-renameElijah Newren2021-02-261-129/+3
* | use CALLOC_ARRAYRené Scharfe2021-03-131-5/+4
|/
* merge-ort: call diffcore_rename() directlyElijah Newren2021-02-151-7/+59
* merge-ort: begin performance work; instrument with trace2_region_* callsElijah Newren2021-01-231-0/+57
* merge-ort: ignore the directory rename split conflict for nowElijah Newren2021-01-231-1/+12
* merge-ort: fix massive leakElijah Newren2021-01-231-0/+17
* Merge branch 'en/ort-directory-rename' into en/merge-ort-perfJunio C Hamano2021-01-201-22/+1228
|\
| * merge-ort: fix a directory rename detection bugElijah Newren2021-01-201-117/+81
| * merge-ort: process_renames() now needs more defensivenessElijah Newren2021-01-201-5/+21
| * merge-ort: implement apply_directory_rename_modifications()Elijah Newren2021-01-201-1/+167
| * merge-ort: add a new toplevel_dir fieldElijah Newren2021-01-201-6/+9
| * merge-ort: implement handle_path_level_conflicts()Elijah Newren2021-01-201-1/+71
| * merge-ort: implement check_for_directory_rename()Elijah Newren2021-01-201-1/+66
| * merge-ort: implement apply_dir_rename() and check_dir_renamed()Elijah Newren2021-01-201-2/+35
| * merge-ort: implement compute_collisions()Elijah Newren2021-01-201-1/+67
| * merge-ort: modify collect_renames() for directory rename handlingElijah Newren2021-01-201-4/+74
| * merge-ort: implement handle_directory_level_conflicts()Elijah Newren2021-01-201-1/+18
| * merge-ort: implement compute_rename_counts()Elijah Newren2021-01-201-2/+52
| * merge-ort: copy get_renamed_dir_portion() from merge-recursive.cElijah Newren2021-01-201-0/+104
| * merge-ort: add outline of get_provisional_directory_renames()Elijah Newren2021-01-201-1/+56
| * merge-ort: add outline for computing directory renamesElijah Newren2021-01-201-1/+24
| * merge-ort: collect which directories are removed in dirs_removedElijah Newren2021-01-071-0/+27
| * merge-ort: initialize and free new directory rename data structuresElijah Newren2021-01-071-0/+35
| * merge-ort: add new data structures for directory rename detectionElijah Newren2021-01-071-3/+31
View Lorry Controller Status