aboutsummaryrefslogtreecommitdiffstats
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2024-04-01Merge branch 'pw/checkout-conflict-errorfix'Junio C Hamano1-1/+4
2024-03-28Merge branch 'eb/hash-transition'Junio C Hamano1-1/+1
2024-03-14merge options: add a conflict style memberPhillip Wood1-0/+3
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-15/+62
2024-03-09merge-ort/merge-recursive: do report errors in `merge_submodule()`Johannes Schindelin1-0/+8
2024-03-09merge-recursive: prepare for `merge_submodule()` to report errorsJohannes Schindelin1-6/+7
2024-03-07Merge branch 'js/merge-tree-3-trees'Junio C Hamano1-1/+2
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin1-1/+3
2024-02-28commit-reach(repo_in_merge_bases_many): report missing commitsJohannes Schindelin1-9/+45
2024-02-23Always check `parse_tree*()`'s return valueJohannes Schindelin1-1/+2
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-5/+0
2023-10-11merge: introduce {copy|clear}_merge_options()Junio C Hamano1-0/+16
2023-10-02tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman1-1/+1
2023-09-16merge-ort: lowercase a few error messagesJeff King1-2/+2
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan1-1/+0
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-21sparse-index.h: move declarations for sparse-index.c from cache.hElijah Newren1-0/+1
2023-06-21name-hash.h: move declarations for name-hash.c from cache.hElijah Newren1-0/+1
2023-04-24match-trees.h: move declarations for match-trees.c functions from cache.hElijah Newren1-0/+1
2023-04-24symlinks.h: move declarations for symlinks.c functions from cache.hElijah Newren1-0/+1
2023-04-11object-file.h: move declarations for object-file.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-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-4/+5
2023-03-28libs: use "struct repository *" argument, not "the_repository"Ævar Arnfjörð Bjarmason1-1/+1
2023-03-28cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-2/+3
2023-03-28cocci: apply the "commit.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-21wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren1-0/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2023-02-23Remove unnecessary includes of builtin.hElijah Newren1-1/+0
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2023-01-17treewide: always have a valid "index_state.repo" memberÆvar Arnfjörð Bjarmason1-1/+1
2023-01-16cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()Ævar Arnfjörð Bjarmason1-1/+1
2022-11-27merge-recursive: fix variable typo in error messageKyle Meyer1-1/+1
2022-09-01git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason1-6/+6
2022-08-19mark unused read_tree_recursive() callback parametersJeff King1-1/+1
2022-08-19hashmap: mark unused callback parametersJeff King1-5/+5
2022-06-07Merge branch 'ab/plug-leak-in-revisions'Junio C Hamano1-2/+3
2022-05-20Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano1-6/+6
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano1-6/+6
2022-04-13revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason1-0/+1
2022-04-13string_list API users: use string_list_init_{no,}dupÆvar Arnfjörð Bjarmason1-2/+2
2022-03-16Merge branch 'ab/object-file-api-updates'Junio C Hamano1-1/+1
2022-02-25object-file API: have write_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason1-1/+1
2022-02-02merge-ort: format messages slightly different for use in headersElijah Newren1-0/+4
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren1-1/+4
2021-10-25Merge branch 'jt/no-abuse-alternate-odb-for-submodules'Junio C Hamano1-21/+20
2021-10-13Merge branch 'en/removing-untracked-fixes'Junio C Hamano1-1/+4
2021-10-08merge-{ort,recursive}: remove add_submodule_odb()Jonathan Tan1-21/+20
2021-10-06Merge branch 'jt/add-submodule-odb-clean-up'Junio C Hamano1-17/+32
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren1-7/+1
2021-09-27read-tree, merge-recursive: overwrite ignored files by defaultElijah Newren1-1/+10
2021-09-22Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-f...Junio C Hamano1-17/+32
2021-09-20Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano1-0/+3
2021-09-09merge: make sparse-aware with ORTDerrick Stolee1-0/+3
2021-09-09revision: remove "submodule" from opt structJonathan Tan1-17/+32
2021-08-30merge-recursive: use fspathcmp() in path_hashmap_cmp()René Scharfe1-4/+1
2021-07-30use fspathhash() everywhereRené Scharfe1-8/+3
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-16Merge branch 'ab/struct-init'Junio C Hamano1-2/+2
2021-07-16Merge branch 'en/merge-dir-rename-corner-case-fix'Junio C Hamano1-6/+13
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-recursive: handle rename-to-self caseElijah Newren1-6/+13
2021-06-14*: fix typos which duplicate a wordAndrei Rybak1-1/+1
2021-05-11Merge branch 'js/merge-already-up-to-date-message-reword'Junio C Hamano1-1/+1
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano1-5/+5
2021-05-03merge(s): apply consistent punctuation to "up to date" messagesEric Sunshine1-1/+1
2021-04-30Merge branch 'ds/sparse-index-protections'Junio C Hamano1-1/+3
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson1-5/+5
2021-04-16Merge branch 'en/ort-readiness'Junio C Hamano1-0/+37
2021-04-14merge-recursive: ensure full indexDerrick Stolee1-0/+2
2021-04-14*: remove 'const' qualifier for struct index_stateDerrick Stolee1-1/+1
2021-03-30Merge branch 'ab/read-tree'Junio C Hamano1-3/+3
2021-03-20tree.h API: simplify read_tree_recursive() signatureÆvar Arnfjörð Bjarmason1-3/+3
2021-03-20merge-recursive: add a bunch of FIXME comments documenting known bugsElijah Newren1-0/+37
2021-03-13use CALLOC_ARRAYRené Scharfe1-5/+4
2020-12-16commit: move reverse_commit_list() from merge-recursiveElijah Newren1-11/+0
2020-11-02hashmap: provide deallocation function namesElijah Newren1-3/+3
2020-08-10Merge branch 'en/eol-attrs-gotchas'Junio C Hamano1-0/+3
2020-08-03merge: make merge.renormalize work for all uses of merge machineryElijah Newren1-0/+3
2020-08-02merge-recursive: fix unclear and outright wrong commentsElijah Newren1-2/+3
2020-05-14merge-recursive: fix rename/rename(1to2) for working tree with a binaryElijah Newren1-0/+12
2020-03-16convert: permit passing additional metadata to filter processesbrian m. carlson1-1/+1
2020-03-09Merge branch 'en/merge-path-collision'Junio C Hamano1-105/+47
2020-03-02Merge branch 'en/t3433-rebase-stat-dirty-failure'Junio C Hamano1-2/+5
2020-02-27merge-recursive: apply collision handling unification to recursive caseElijah Newren1-105/+47
2020-02-19merge-recursive: fix the refresh logic in update_file_flagsElijah Newren1-2/+5
2020-01-27merge-recursive: use subtraction to flip stageJunio C Hamano1-3/+2
2020-01-27merge-recursive: silence -Wxor-used-as-pow warningJeff King1-5/+14
2020-01-06Merge branch 'en/merge-recursive-oid-eq-simplify'Junio C Hamano1-22/+11
2020-01-02merge-recursive: remove unnecessary oid_eq functionElijah Newren1-22/+11
2019-11-10Merge branch 'en/merge-recursive-directory-rename-fixes'Junio C Hamano1-23/+81
2019-10-23merge-recursive: fix merging a subdirectory into the root directoryElijah Newren1-3/+49
2019-10-23merge-recursive: clean up get_renamed_dir_portion()Elijah Newren1-24/+36
2019-10-15Merge branch 'ew/hashmap'Junio C Hamano1-40/+51
2019-10-15Merge branch 'en/merge-recursive-cleanup'Junio C Hamano1-226/+346
2019-10-08merge-recursive: fix the fix to the diff3 common ancestor labelElijah Newren1-1/+2
2019-10-07hashmap: remove type arg from hashmap_{get,put,remove}_entryEric Wong1-4/+2
2019-10-07OFFSETOF_VAR macro to simplify hashmap iteratorsEric Wong1-5/+0
2019-10-07hashmap: introduce hashmap_free_entriesEric Wong1-3/+4
2019-10-07hashmap: use *_entry APIs for iterationEric Wong1-10/+15
2019-10-07hashmap_cmp_fn takes hashmap_entry paramsEric Wong1-12/+21
2019-10-07hashmap_get{,_from_hash} return "struct hashmap_entry *"Eric Wong1-2/+4
2019-10-07hashmap_put takes "struct hashmap_entry *"Eric Wong1-2/+2
2019-10-07hashmap_remove takes "const struct hashmap_entry *"Eric Wong1-1/+1
2019-10-07hashmap_get takes "const struct hashmap_entry *"Eric Wong1-2/+2
2019-10-07hashmap_add takes "struct hashmap_entry *"Eric Wong1-2/+2
2019-10-07hashmap_entry_init takes "struct hashmap_entry *"Eric Wong1-6/+7
2019-10-02merge-recursive: fix the diff3 common ancestor label for virtual commitsElijah Newren1-1/+6
2019-09-20merge-recursive: symlink's descendants not in wayJonathan Tan1-1/+2
2019-08-19merge-recursive: alphabetize include listElijah Newren1-16/+17
2019-08-19merge-recursive: add sanity checks for relevant merge_optionsElijah Newren1-0/+24
2019-08-19merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*Elijah Newren1-7/+7
2019-08-19merge-recursive: split internal fields into a separate structElijah Newren1-87/+98
2019-08-19merge-recursive: avoid losing output and leaking memory holding that outputElijah Newren1-3/+3
2019-08-19merge-recursive: comment and reorder the merge_options fieldsElijah Newren1-5/+11
2019-08-19merge-recursive: consolidate unnecessary fields in merge_optionsElijah Newren1-16/+11
2019-08-19merge-recursive: move some definitions around to clean up the headerElijah Newren1-0/+31
2019-08-19merge-recursive: rename 'mrtree' to 'result_tree', for clarityElijah Newren1-3/+4
2019-08-19merge-recursive: use common name for ancestors/common/base_listElijah Newren1-35/+37
2019-08-19merge-recursive: fix some overly long linesElijah Newren1-6/+13
2019-08-19cache-tree: share code between functions writing an index as a treeElijah Newren1-32/+2
2019-08-19merge-recursive: don't force external callers to do our loggingElijah Newren1-4/+3
2019-08-19merge-recursive: remove useless parameter in merge_trees()Elijah Newren1-3/+3
2019-08-19merge-recursive: exit early if index != headElijah Newren1-29/+72
2019-08-19merge-recursive: remove another implicit dependency on the_repositoryElijah Newren1-2/+5
2019-08-19merge-recursive: future-proof update_file_flags() against memory leaksElijah Newren1-3/+5
2019-08-19merge-recursive: introduce an enum for detect_directory_renames valuesDerrick Stolee1-9/+15
2019-08-19merge-recursive: provide a better label for diff3 common ancestorElijah Newren1-1/+15
2019-08-16merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()Elijah Newren1-10/+9
2019-08-16merge-recursive: be consistent with assertElijah Newren1-1/+1
2019-08-08Merge branch 'en/disable-dir-rename-in-recursive-merge'Junio C Hamano1-1/+2
2019-08-06merge-recursive: avoid directory rename detection in recursive caseElijah Newren1-1/+2
2019-06-27Use the right 'struct repository' instead of the_repositoryNguyễn Thái Ngọc Duy1-15/+20
2019-06-27match-trees.c: remove the_repo from shift_tree*()Nguyễn Thái Ngọc Duy1-2/+2
2019-06-27tree-walk.c: remove the_repo from get_tree_entry()Nguyễn Thái Ngọc Duy1-3/+5
2019-06-06Merge branch 'en/merge-directory-renames-fix'Junio C Hamano1-0/+1
2019-06-05merge-recursive: restore accidentally dropped setting of pathElijah Newren1-0/+1
2019-05-09Merge branch 'nd/sha1-name-c-wo-the-repository'Junio C Hamano1-1/+6
2019-05-09Merge branch 'en/merge-directory-renames'Junio C Hamano1-938/+915
2019-04-16commit.cocci: refactor code, avoid double rewriteNguyễn Thái Ngọc Duy1-1/+6
2019-04-08merge-recursive: switch directory rename detection defaultElijah Newren1-23/+123
2019-04-08merge-recursive: give callers of handle_content_merge() access to contentsElijah Newren1-17/+20
2019-04-08merge-recursive: track information associated with directory renamesElijah Newren1-14/+23
2019-04-08merge-recursive: switch from (oid,mode) pairs to a diff_filespecElijah Newren1-268/+215
2019-04-08merge-recursive: cleanup handle_rename_* function signaturesElijah Newren1-16/+15
2019-04-08merge-recursive: track branch where rename occurred in rename structElijah Newren1-71/+42
2019-04-08merge-recursive: remove ren[12]_other fields from rename_conflict_infoElijah Newren1-50/+21
2019-04-08merge-recursive: shrink rename_conflict_infoElijah Newren1-70/+50
2019-04-08merge-recursive: move some struct declarations togetherElijah Newren1-39/+39
2019-04-08merge-recursive: use 'ci' for rename_conflict_info variable nameElijah Newren1-23/+18
2019-04-08merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf'Elijah Newren1-8/+10
2019-04-08merge-recursive: rename diff_filespec 'one' to 'o'Elijah Newren1-23/+23
2019-04-08merge-recursive: rename merge_options argument from 'o' to 'opt'Elijah Newren1-492/+492
2019-04-08Use 'unsigned short' for mode, like diff_filespec doesElijah Newren1-3/+3
2019-04-01submodule: avoid hard-coded constantsbrian m. carlson1-1/+1
2019-03-07Merge branch 'nd/completion-more-parameters'Junio C Hamano1-0/+4
2019-02-20completion: add more parameter value completionNguyễn Thái Ngọc Duy1-0/+4
2019-02-14merge-recursive: drop several unused parametersJeff King1-12/+7
2019-02-06Merge branch 'nd/the-index-final'Junio C Hamano1-88/+103
2019-01-14Merge branch 'nd/attr-pathspec-in-tree-walk'Junio C Hamano1-1/+2
2019-01-14read-cache.c: remove the_* from index_has_changes()Nguyễn Thái Ngọc Duy1-1/+1
2019-01-14merge-recursive.c: remove implicit dependency on the_repositoryNguyễn Thái Ngọc Duy1-21/+24
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-68/+80
2019-01-14read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy1-1/+1
2019-01-14repository.c: replace hold_locked_index() with repo_hold_locked_index()Nguyễn Thái Ngọc Duy1-1/+1
2019-01-04Merge branch 'en/merge-path-collision'Junio C Hamano1-213/+316
2018-11-19tree.c: make read_tree*() take 'struct repository *'Nguyễn Thái Ngọc Duy1-1/+2
2018-11-08merge-recursive: combine error handlingDerrick Stolee1-26/+27
2018-11-08merge-recursive: improve rename/rename(1to2)/add[/add] handlingElijah Newren1-77/+77
2018-11-08merge-recursive: use handle_file_collision for add/add conflictsElijah Newren1-8/+21
2018-11-08merge-recursive: improve handling for rename/rename(2to1) conflictsElijah Newren1-90/+14
2018-11-08merge-recursive: fix rename/add conflict handlingElijah Newren1-51/+86
2018-11-08merge-recursive: new function for better colliding conflict resolutionsElijah Newren1-0/+121
2018-11-08merge-recursive: increase marker length with depth of recursionElijah Newren1-8/+17
2018-11-03Merge branch 'en/merge-cleanup-more'Junio C Hamano1-3/+33
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-3/+4
2018-10-18merge-recursive: avoid showing conflicts with merge branch before HEADElijah Newren1-1/+31
2018-10-18merge-recursive: improve auto-merging messages with path collisionsElijah Newren1-2/+2
2018-10-16Merge branch 'en/merge-cleanup'Junio C Hamano1-93/+51
2018-09-24Merge branch 'en/double-semicolon-fix'Junio C Hamano1-1/+1
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+2
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-09-20merge-recursive: rename merge_file_1() and merge_content()Elijah Newren1-32/+34
2018-09-20merge-recursive: remove final remaining caller of merge_file_one()Elijah Newren1-27/+17
2018-09-20merge-recursive: avoid wrapper function when unnecessary and wastefulElijah Newren1-4/+1
2018-09-20merge-recursive: set paths correctly when three-way merging contentElijah Newren1-40/+9
2018-09-17Merge branch 'jk/cocci'Junio C Hamano1-2/+2
2018-09-17Merge branch 'ds/reachable'Junio C Hamano1-0/+1
2018-09-05Remove superfluous trailing semicolonsElijah Newren1-1/+1
2018-09-04Merge branch 'en/directory-renames-nothanks'Junio C Hamano1-5/+13
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 12:57:36 +0000