Commit Graph

715 Commits (master)

Author SHA1 Message Date
Ævar Arnfjörð Bjarmason 5cf88fd8b0 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 3 weeks ago
Jeff King 555ff1c8a4 mark unused read_tree_recursive() callback parameters 1 month ago
Jeff King 02c3c59e62 hashmap: mark unused callback parameters 1 month 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 f260505142 string_list API users: use string_list_init_{no,}dup 5 months ago
Ævar Arnfjörð Bjarmason c80d226a04 object-file API: have write_object_file() take "enum object_type" 7 months ago
Elijah Newren 6054d1aac3 merge-ort: format messages slightly different for use in headers 8 months ago
Elijah Newren 35f6967161 ll-merge: make callers responsible for showing warnings 8 months ago
Jonathan Tan 155b517d5c merge-{ort,recursive}: remove add_submodule_odb() 12 months ago
Elijah Newren 04988c8d18 unpack-trees: introduce preserve_ignored to unpack_trees_options 1 year ago
Elijah Newren 491a7575f1 read-tree, merge-recursive: overwrite ignored files by default 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
René Scharfe 2dee7e6105 merge-recursive: use fspathcmp() in path_hashmap_cmp() 1 year ago
René Scharfe 7431842325 use fspathhash() everywhere 1 year ago
Elijah Newren 94b82d5686 rename: bump limit defaults yet again 1 year ago
Ævar Arnfjörð Bjarmason 48ca53cac4 *.c static functions: add missing __attribute__((format)) 1 year ago
Ævar Arnfjörð Bjarmason bc40dfb10a string-list.h users: change to use *_{nodup,dup}() 1 year ago
Elijah Newren 3585d0ea23 merge-recursive: handle rename-to-self case 1 year ago
Andrei Rybak abcb66c614 *: fix typos which duplicate a word 1 year ago
Eric Sunshine 80cde95eec merge(s): apply consistent punctuation to "up to date" messages 1 year ago
brian m. carlson 14228447c9 hash: provide per-algorithm null OIDs 1 year ago
Derrick Stolee f7ef64be0c merge-recursive: ensure full index 1 year ago
Derrick Stolee 847a9e5d4f *: remove 'const' qualifier for struct index_state 1 year ago
Ævar Arnfjörð Bjarmason 47957485b3 tree.h API: simplify read_tree_recursive() signature 2 years ago
Elijah Newren 816147e7ba merge-recursive: add a bunch of FIXME comments documenting known bugs 2 years ago
René Scharfe ca56dadb4b use CALLOC_ARRAY 2 years ago
Elijah Newren b0ca120554 commit: move reverse_commit_list() from merge-recursive 2 years ago
Elijah Newren 6da1a25814 hashmap: provide deallocation function names 2 years ago
Elijah Newren 8d552258f4 merge: make merge.renormalize work for all uses of merge machinery 2 years ago
Elijah Newren 56e743426b merge-recursive: fix unclear and outright wrong comments 2 years ago
Elijah Newren 95983da6b4 merge-recursive: fix rename/rename(1to2) for working tree with a binary 2 years ago
brian m. carlson ab90ecae99 convert: permit passing additional metadata to filter processes 3 years ago
Elijah Newren 802050400a merge-recursive: apply collision handling unification to recursive case 3 years ago
Elijah Newren fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags 3 years ago
Junio C Hamano 4c616c2ba1 merge-recursive: use subtraction to flip stage 3 years ago
Jeff King ee798742bd merge-recursive: silence -Wxor-used-as-pow warning 3 years ago
Elijah Newren 763a59e71c merge-recursive: remove unnecessary oid_eq function 3 years ago
Elijah Newren 49b8133a9e merge-recursive: fix merging a subdirectory into the root directory 3 years ago
Elijah Newren d3eebaad5e merge-recursive: clean up get_renamed_dir_portion() 3 years ago
Elijah Newren b657047719 merge-recursive: fix the fix to the diff3 common ancestor label 3 years ago
Eric Wong 404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry 3 years ago
Eric Wong 23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators 3 years ago
Eric Wong c8e424c9c9 hashmap: introduce hashmap_free_entries 3 years ago
Eric Wong 87571c3f71 hashmap: use *_entry APIs for iteration 3 years ago
Eric Wong 939af16eac hashmap_cmp_fn takes hashmap_entry params 3 years ago
Eric Wong f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *" 3 years ago
Eric Wong 26b455f21e hashmap_put takes "struct hashmap_entry *" 3 years ago
Eric Wong 28ee794128 hashmap_remove takes "const struct hashmap_entry *" 3 years ago