Commit Graph

210 Commits (master)

Author SHA1 Message Date
Elijah Newren ff033db7a8 merge-ort: remove code obsoleted by other changes 1 month ago
Elijah Newren 565577ed88 merge-ort: provide helpful submodule update message when possible 1 month ago
Elijah Newren 34ce504a33 merge-ort: avoid surprise with new sub_flag variable 1 month ago
Elijah Newren a5834b775b merge-ort: remove translator lego in new "submodule conflict suggestion" 1 month ago
Calvin Wan 4057523a40 submodule merge: update conflict error message 2 months ago
Johannes Schindelin 1250dff32b merge-ort: do leave trace2 region even if checkout fails 2 months ago
Johannes Schindelin fef2b6dace merge-ort: clean up after failed merge 2 months ago
Elijah Newren 751e165424 merge-ort: fix issue with dual rename and add/add conflict 3 months ago
Elijah Newren 3ffbe5a223 merge-ort: shuffle the computation and cleanup of potential collisions 3 months ago
Elijah Newren 6dd1f0e9d4 merge-ort: make a separate function for freeing struct collisions 3 months ago
Elijah Newren 51e41e4eaf merge-ort: small cleanups of check_for_directory_rename 3 months ago
Elijah Newren de90581141 merge-ort: optionally produce machine-readable output 3 months ago
Elijah Newren cb2607759e merge-ort: store more specific conflict information 3 months ago
Johannes Schindelin 2715e8a931 merge-ort: make `path_messages` a strmap to a string_list 3 months ago
Johannes Schindelin 6debb7527b merge-ort: store messages in a list, not in a single strbuf 3 months ago
Elijah Newren a4040cfa35 merge-ort: remove command-line-centric submodule message from merge-ort 3 months ago
Elijah Newren fae26ce79c merge-ort: provide a merge_get_conflicted_files() helper function 3 months ago
Elijah Newren a34edae68a merge-ort: split out a separate display_update_messages() function 3 months ago
Junio C Hamano afe8a9070b tree-wide: apply equals-null.cocci 5 months ago
Ævar Arnfjörð Bjarmason 2108fe4a19 revisions API users: add straightforward release_revisions() 5 months ago
Ævar Arnfjörð Bjarmason 99d60545f8 string-list API: change "nr" and "alloc" to "size_t" 7 months ago
Elijah Newren 624a93507e merge-ort: exclude messages from inner merges by default 7 months ago
Ævar Arnfjörð Bjarmason c80d226a04 object-file API: have write_object_file() take "enum object_type" 7 months ago
Elijah Newren 81afc79412 merge-ort: fix small memory leak in unique_path() 7 months ago
Elijah Newren 8d60e9d201 merge-ort: fix small memory leak in detect_and_process_renames() 7 months ago
Elijah Newren 4a3d86e1bb merge-ort: make informational messages from recursive merges clearer 7 months ago
Elijah Newren 0d83d8240d merge-ort: mark conflict/warning messages from inner merges as omittable 8 months ago
Elijah Newren 20323d104e show, log: include conflict/warning messages in --remerge-diff headers 8 months ago
Elijah Newren 6054d1aac3 merge-ort: format messages slightly different for use in headers 8 months ago
Elijah Newren a28d094ac2 merge-ort: mark a few more conflict messages as omittable 8 months ago
Elijah Newren 24dbdab50d merge-ort: capture and print ll-merge warnings in our preferred fashion 8 months ago
Elijah Newren 35f6967161 ll-merge: make callers responsible for showing warnings 8 months ago
Elijah Newren a59b8dd94f merge-ort: fix memory leak in merge_ort_internal() 8 months ago
Elijah Newren 9ae39fef7f merge-ort: avoid assuming all renames detected 8 months ago
Elijah Newren d30126c20d merge-ort: fix bug with renormalization and rename/delete conflicts 9 months ago
Jonathan Tan 155b517d5c merge-{ort,recursive}: remove add_submodule_odb() 12 months ago
Elijah Newren 1b5f37334a Remove ignored files by default when they are in the way 1 year ago
Elijah Newren 04988c8d18 unpack-trees: introduce preserve_ignored to unpack_trees_options 1 year ago
Elijah Newren 3584cff71c merge-ort: fix completely wrong comment 1 year ago
Derrick Stolee 6957636792 merge-ort: expand only for out-of-cone conflicts 1 year ago
Derrick Stolee a33806398a merge: make sparse-aware with ORT 1 year ago
Jonathan Tan 10a0d6ae64 revision: remove "submodule" from opt struct 1 year ago
Elijah Newren 62a15162fe merge-ort: remove compile-time ability to turn off usage of memory pools 1 year ago
Elijah Newren 092e5115d1 merge-ort: reuse path strings in pool_alloc_filespec 1 year ago
Elijah Newren f239fff4c1 merge-ort: store filepairs and filespecs in our mem_pool 1 year ago
Elijah Newren a8791ef649 diffcore-rename, merge-ort: add wrapper functions for filepair alloc/dealloc 1 year ago
Elijah Newren 6697ee01b5 merge-ort: switch our strmaps over to using memory pools 1 year ago
Elijah Newren 4137c54b90 merge-ort: set up a memory pool 1 year ago
Elijah Newren cdf2241c71 merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappers 1 year ago
Elijah Newren 7afc0b03a2 merge-ort: rename str{map,intmap,set}_func() 1 year ago