aboutsummaryrefslogtreecommitdiffstats
path: root/merge-ort.c
AgeCommit message (Expand)AuthorFilesLines
2024-04-01Merge branch 'pw/checkout-conflict-errorfix'Junio C Hamano1-1/+2
2024-03-28Merge branch 'eb/hash-transition'Junio C Hamano1-5/+6
2024-03-14merge options: add a conflict style memberPhillip Wood1-0/+1
2024-03-14merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood1-1/+1
2024-03-11Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano1-11/+81
2024-03-09merge-ort/merge-recursive: do report errors in `merge_submodule()`Johannes Schindelin1-0/+5
2024-03-07Merge branch 'js/merge-tree-3-trees'Junio C Hamano1-5/+11
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin1-1/+5
2024-02-28commit-reach(repo_in_merge_bases_many): report missing commitsJohannes Schindelin1-10/+71
2024-02-26merge-ort: turn submodule conflict suggestions into an advicePhilippe Blain1-1/+2
2024-02-23Always check `parse_tree*()`'s return valueJohannes Schindelin1-0/+3
2024-02-23merge-ort: do check `parse_tree()`'s return valueJohannes Schindelin1-2/+4
2024-02-23merge-tree: fail with a non-zero exit code on missing tree objectsJohannes Schindelin1-3/+4
2024-02-06Merge branch 'jc/comment-style-fixes'Junio C Hamano1-1/+1
2024-01-29merge-ort.c: comment style fixJunio C Hamano1-1/+1
2024-01-19refs: convert AUTO_MERGE to become a normal pseudo-refPatrick Steinhardt1-7/+12
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-1/+0
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-2/+0
2023-10-30Merge branch 'wx/merge-ort-comment-typofix'Junio C Hamano1-1/+1
2023-10-21merge-ort.c: fix typo 'neeed' to 'needed'王常新1-1/+1
2023-10-18Merge branch 'jc/merge-ort-attr-index-fix'Junio C Hamano1-0/+1
2023-10-09merge-ort: initialize repo in index stateJohn Cai1-0/+1
2023-10-02tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman1-5/+6
2023-09-16merge-ort: lowercase a few error messagesJeff King1-2/+2
2023-09-14merge-ort: drop unused "opt" parameter from merge_check_renames_reusable()Jeff King1-3/+2
2023-09-14merge-ort: drop unused parameters from detect_and_process_renames()Jeff King1-6/+2
2023-09-14merge-ort: stop passing "opt" to read_oid_strbuf()Jeff King1-4/+3
2023-09-14merge-ort: drop custom err() functionJeff King1-23/+5
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-21repository: remove unnecessary include of path.hElijah Newren1-0/+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-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-05-02Merge branch 'en/ort-finalize-after-0-merges-fix'Junio C Hamano1-4/+4
2023-04-24merge-ort: fix calling merge_finalize() with no intermediate mergeElijah Newren1-4/+4
2023-04-24match-trees.h: move declarations for match-trees.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 mem-pool.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 trace.h & trace2.hElijah Newren1-0/+1
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 "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+1
2023-03-28cocci: apply the "commit-reach.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+1
2023-03-21environment.h: move declarations for environment.c 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
2022-10-30Merge branch 'en/ort-dir-rename-and-symlink-fix'Taylor Blau1-2/+34
2022-10-27Merge branch 'jk/unused-anno-more'Junio C Hamano1-1/+1
2022-10-22merge-ort: fix bug with dir rename vs change dir to symlinkElijah Newren1-2/+34
2022-10-17string-list: mark unused callback parametersJeff King1-1/+1
2022-09-28merge-ort: return early when failing to write a blobJohannes Schindelin1-9/+19
2022-09-28merge-ort: fix segmentation fault in read-only repositoriesJohannes Schindelin1-25/+41
2022-08-29Merge branch 'en/ort-unused-code-removal'Junio C Hamano1-20/+2
2022-08-25Merge branch 'en/submodule-merge-messages-fixes'Junio C Hamano1-9/+116
2022-08-19merge-ort: remove code obsoleted by other changesElijah Newren1-20/+2
2022-08-18merge-ort: provide helpful submodule update message when possibleElijah Newren1-11/+7
2022-08-18merge-ort: avoid surprise with new sub_flag variableElijah Newren1-1/+1
2022-08-18merge-ort: remove translator lego in new "submodule conflict suggestion"Elijah Newren1-60/+28
2022-08-08Merge branch 'js/ort-clean-up-after-failed-merge'Junio C Hamano1-0/+5
2022-08-04submodule merge: update conflict error messageCalvin Wan1-9/+152
2022-07-31merge-ort: do leave trace2 region even if checkout failsJohannes Schindelin1-0/+3
2022-07-31merge-ort: clean up after failed mergeJohannes Schindelin1-0/+2
2022-07-18Merge branch 'en/merge-dual-dir-renames-fix'Junio C Hamano1-26/+48
2022-07-06merge-ort: fix issue with dual rename and add/add conflictElijah Newren1-1/+7
2022-07-06merge-ort: shuffle the computation and cleanup of potential collisionsElijah Newren1-5/+15
2022-07-06merge-ort: make a separate function for freeing struct collisionsElijah Newren1-16/+22
2022-07-06merge-ort: small cleanups of check_for_directory_renameElijah Newren1-6/+6
2022-06-22merge-ort: optionally produce machine-readable outputElijah Newren1-2/+20
2022-06-22merge-ort: store more specific conflict informationElijah Newren1-55/+212
2022-06-22merge-ort: make `path_messages` a strmap to a string_listJohannes Schindelin1-33/+1
2022-06-22merge-ort: store messages in a list, not in a single strbufJohannes Schindelin1-43/+80
2022-06-22merge-ort: remove command-line-centric submodule message from merge-ortElijah Newren1-8/+1
2022-06-22merge-ort: provide a merge_get_conflicted_files() helper functionElijah Newren1-0/+31
2022-06-22merge-ort: split out a separate display_update_messages() functionElijah Newren1-37/+41
2022-06-07Merge branch 'ab/plug-leak-in-revisions'Junio C Hamano1-0/+1
2022-05-20Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano1-2/+2
2022-05-02Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano1-2/+2
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano1-2/+2
2022-04-13revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason1-0/+1
2022-03-16Merge branch 'ab/string-list-count-in-size-t'Junio C Hamano1-2/+2
2022-03-16Merge branch 'ab/object-file-api-updates'Junio C Hamano1-2/+2
2022-03-13Merge branch 'en/merge-ort-align-verbosity-with-recursive'Junio C Hamano1-2/+3
2022-03-07string-list API: change "nr" and "alloc" to "size_t"Ævar Arnfjörð Bjarmason1-2/+2
2022-03-06Merge branch 'en/merge-ort-plug-leaks'Junio C Hamano1-19/+17
2022-03-01merge-ort: exclude messages from inner merges by defaultElijah Newren1-2/+3
2022-02-25object-file API: have write_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason1-2/+2
2022-02-20merge-ort: fix small memory leak in unique_path()Elijah Newren1-9/+12
2022-02-20merge-ort: fix small memory leak in detect_and_process_renames()Elijah Newren1-10/+5
2022-02-17merge-ort: make informational messages from recursive merges clearerElijah Newren1-0/+5
2022-02-16Merge branch 'en/remerge-diff'Junio C Hamano1-5/+50
2022-02-09Merge branch 'en/plug-leaks-in-merge'Junio C Hamano1-5/+5
2022-02-09Merge branch 'en/merge-ort-restart-optim-fix'Junio C Hamano1-0/+4
2022-02-02merge-ort: mark conflict/warning messages from inner merges as omittableElijah Newren1-1/+3
2022-02-02show, log: include conflict/warning messages in --remerge-diff headersElijah Newren1-0/+1
2022-02-02merge-ort: format messages slightly different for use in headersElijah Newren1-2/+40
2022-02-02merge-ort: mark a few more conflict messages as omittableElijah Newren1-2/+2
2022-02-02merge-ort: capture and print ll-merge warnings in our preferred fashionElijah Newren1-2/+3
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren1-1/+4
2022-01-21merge-ort: fix memory leak in merge_ort_internal()Elijah Newren1-5/+5
2022-01-17merge-ort: avoid assuming all renames detectedElijah Newren1-0/+4
2021-12-30merge-ort: fix bug with renormalization and rename/delete conflictsElijah Newren1-3/+16
2021-10-25Merge branch 'jt/no-abuse-alternate-odb-for-submodules'Junio C Hamano1-14/+4
2021-10-13Merge branch 'en/removing-untracked-fixes'Junio C Hamano1-7/+1
2021-10-08merge-{ort,recursive}: remove add_submodule_odb()Jonathan Tan1-14/+4
2021-10-06Merge branch 'jt/add-submodule-odb-clean-up'Junio C Hamano1-18/+35
2021-09-28Merge branch 'en/typofixes'Junio C Hamano1-1/+1
2021-09-27Remove ignored files by default when they are in the wayElijah Newren1-1/+1
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren1-7/+1
2021-09-22Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-f...Junio C Hamano1-18/+35
2021-09-20Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano1-0/+15
2021-09-20merge-ort: fix completely wrong commentElijah Newren1-1/+1
2021-09-09merge-ort: expand only for out-of-cone conflictsDerrick Stolee1-3/+10
2021-09-09merge: make sparse-aware with ORTDerrick Stolee1-0/+8
2021-09-09revision: remove "submodule" from opt structJonathan Tan1-18/+35
2021-08-24Merge branch 'en/ort-perf-batch-15'Junio C Hamano1-85/+103
2021-08-04Merge branch 'en/ort-perf-batch-14'Junio C Hamano1-11/+388
2021-08-03merge-ort: remove compile-time ability to turn off usage of memory poolsElijah Newren1-162/+47
2021-07-30merge-ort: reuse path strings in pool_alloc_filespecElijah Newren1-7/+22
2021-07-30merge-ort: store filepairs and filespecs in our mem_poolElijah Newren1-12/+14
2021-07-30diffcore-rename, merge-ort: add wrapper functions for filepair alloc/deallocElijah Newren1-0/+42
2021-07-30merge-ort: switch our strmaps over to using memory poolsElijah Newren1-50/+75
2021-07-30merge-ort: set up a memory poolElijah Newren1-0/+25
2021-07-30merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappersElijah Newren1-0/+24
2021-07-30merge-ort: rename str{map,intmap,set}_func()Elijah Newren1-13/+13
2021-07-28Merge branch 'en/rename-limits-doc'Junio C Hamano1-1/+1
2021-07-28Merge branch 'ab/attribute-format'Junio C Hamano1-0/+1
2021-07-20merge-ort: restart merge with cached renames to reduce process entry costElijah Newren1-6/+86
2021-07-20merge-ort: avoid recursing into directories when we don't need toElijah Newren1-3/+99
2021-07-20merge-ort: defer recursing into directories when merge base is matchedElijah Newren1-2/+31
2021-07-20merge-ort: add a handle_deferred_entries() helper functionElijah Newren1-0/+64
2021-07-20merge-ort: add data structures for allowable trivial directory resolvesElijah Newren1-0/+61
2021-07-20merge-ort: add some more explanations in collect_merge_info_callback()Elijah Newren1-5/+15
2021-07-20merge-ort: resolve paths early when we have sufficient informationElijah Newren1-0/+37
2021-07-16Merge branch 'ab/struct-init'Junio C Hamano1-2/+2
2021-07-16Merge branch 'en/merge-dir-rename-corner-case-fix'Junio C Hamano1-1/+5
2021-07-16Merge branch 'en/ort-perf-batch-13'Junio C Hamano1-0/+50
2021-07-16Merge branch 'en/ort-perf-batch-12'Junio C Hamano1-23/+57
2021-07-15rename: bump limit defaults yet againElijah Newren1-1/+1
2021-07-13*.c static functions: add missing __attribute__((format))Ævar Arnfjörð Bjarmason1-0/+1
2021-07-01string-list.h users: change to use *_{nodup,dup}()Ævar Arnfjörð Bjarmason1-2/+2
2021-06-30merge-ort: ensure we consult df_conflict and path_conflictsElijah Newren1-1/+5
2021-06-28merge-ort: add prefetching for content mergesElijah Newren1-0/+50
2021-06-14Merge branch 'en/ort-perf-batch-11'Junio C Hamano1-12/+319
2021-06-09merge-ort: miscellaneous touch-upsElijah Newren1-0/+5
2021-06-09Fix various issues found in commentsElijah Newren1-3/+5
2021-06-09merge-ort: replace string_list_df_name_compare with faster alternativeElijah Newren1-20/+47
2021-05-20merge-ort, diffcore-rename: employ cached renames when possibleElijah Newren1-5/+42
2021-05-20merge-ort: handle interactions of caching and rename/rename(1to1) casesElijah Newren1-1/+29
2021-05-20merge-ort: add helper functions for using cached renamesElijah Newren1-0/+47
2021-05-20merge-ort: preserve cached renames for the appropriate sideElijah Newren1-9/+11
2021-05-20merge-ort: avoid accidental API mis-useElijah Newren1-0/+7
2021-05-20merge-ort: add code to check for whether cached renames can be reusedElijah Newren1-2/+64
2021-05-20merge-ort: populate caches of rename detection resultsElijah Newren1-1/+72
2021-05-20merge-ort: add data structures for in-memory caching of rename detectionElijah Newren1-0/+53
2021-05-16Merge branch 'ah/merge-ort-i18n'Junio C Hamano1-6/+15
2021-05-11merge-ort: split "distinct types" message into two translatable messagesAlex Henrie1-6/+15
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano1-10/+10
2021-04-30Merge branch 'ds/sparse-index-protections'Junio C Hamano1-1/+1
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson1-10/+10
2021-04-16Merge branch 'ah/merge-ort-ubsan-fix'Junio C Hamano1-14/+6
2021-04-16Merge branch 'en/ort-readiness'Junio C Hamano1-28/+215
2021-04-16Merge branch 'en/ort-perf-batch-10'Junio C Hamano1-18/+61
2021-04-12merge-ort: only do pointer arithmetic for non-empty listsAndrzej Hunt1-13/+5
2021-04-08Merge branch 'en/ort-perf-batch-9'Junio C Hamano1-4/+230
2021-03-22Merge branch 'en/ort-perf-batch-8'Junio C Hamano1-138/+6
2021-03-20Revert "merge-ort: ignore the directory rename split conflict for now"Elijah Newren1-12/+1
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren1-0/+10
2021-03-20merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entriesElijah Newren1-13/+30
2021-03-20merge-ort: support subtree shiftingElijah Newren1-0/+24
2021-03-20merge-ort: let renormalization change modify/delete into clean deleteElijah Newren1-2/+62
2021-03-20merge-ort: have ll_merge() use a special attr_index for renormalizationElijah Newren1-2/+62
2021-03-20merge-ort: add a special minimal index just for renormalizationElijah Newren1-0/+20
2021-03-20merge-ort: use STABLE_QSORT instead of QSORT where requiredElijah Newren1-1/+7
2021-03-18merge-ort: record the reason that we want a rename for a fileElijah Newren1-5/+10
2021-03-18diffcore-rename: add computation of number of unknown renamesElijah Newren1-0/+3
2021-03-18merge-ort: record the reason that we want a rename for a directoryElijah Newren1-3/+38
2021-03-18merge-ort, diffcore-rename: tweak dirs_removed and relevant_source typeElijah Newren1-14/+14
2021-03-13use CALLOC_ARRAYRené Scharfe1-5/+4
2021-03-10merge-ort: skip rename detection entirely if possibleElijah Newren1-0/+44
2021-03-10merge-ort: use relevant_sources to filter possible rename sourcesElijah Newren1-1/+1
2021-03-10merge-ort: precompute whether directory rename detection is neededElijah Newren1-6/+61
2021-03-10merge-ort: introduce wrappers for alternate tree traversalElijah Newren1-0/+71
2021-03-10merge-ort: add data structures for an alternate tree traversalElijah Newren1-0/+26
2021-03-10merge-ort: precompute subset of sources for which we need rename detectionElijah Newren1-3/+32
2021-03-10diffcore-rename: enable filtering possible rename sourcesElijah Newren1-0/+1
2021-02-26diffcore-rename: add function for clearing dir_rename_countElijah Newren1-9/+3
2021-02-26Move computation of dir_rename_count from merge-ort to diffcore-renameElijah Newren1-129/+3
2021-02-15merge-ort: call diffcore_rename() directlyElijah Newren1-7/+59
2021-01-23merge-ort: begin performance work; instrument with trace2_region_* callsElijah Newren1-0/+57
2021-01-23merge-ort: ignore the directory rename split conflict for nowElijah Newren1-1/+12
2021-01-23merge-ort: fix massive leakElijah Newren1-0/+17
2021-01-20Merge branch 'en/ort-directory-rename' into en/merge-ort-perfJunio C Hamano1-22/+1228
2021-01-20merge-ort: fix a directory rename detection bugElijah Newren1-117/+81
2021-01-20merge-ort: process_renames() now needs more defensivenessElijah Newren1-5/+21
2021-01-20merge-ort: implement apply_directory_rename_modifications()Elijah Newren1-1/+167
2021-01-20merge-ort: add a new toplevel_dir fieldElijah Newren1-6/+9
2021-01-20merge-ort: implement handle_path_level_conflicts()Elijah Newren1-1/+71
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 14:57:02 +0000