aboutsummaryrefslogtreecommitdiffstats
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
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
2018-08-30merge-recursive: add ability to turn off directory rename detectionElijah Newren1-5/+13
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-2/+2
2018-08-20Merge branch 'nd/no-the-index'Junio C Hamano1-1/+1
2018-08-15Merge branch 'en/merge-recursive-skip-fix'Junio C Hamano1-0/+16
2018-08-13convert.c: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-08-02Merge branch 'en/dirty-merge-fixes'Junio C Hamano1-7/+7
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano1-2/+2
2018-08-02Merge branch 'sb/object-store-lookup'Junio C Hamano1-7/+10
2018-07-27merge-recursive: preserve skip_worktree bit when necessaryElijah Newren1-0/+16
2018-07-20commit.h: remove method declarationsDerrick Stolee1-0/+1
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano1-0/+1
2018-07-18Merge branch 'en/merge-recursive-cleanup'Junio C Hamano1-82/+104
2018-07-11merge-recursive: enforce rule that index matches head before mergingElijah Newren1-7/+7
2018-07-11merge-recursive: fix assumption that head tree being merged is HEADElijah Newren1-1/+1
2018-07-11merge-recursive: make sure when we say we abort that we actually abortElijah Newren1-2/+2
2018-07-03index_has_changes(): avoid assuming operating on the_indexElijah Newren1-1/+1
2018-07-03block alloc: add lifecycle APIs for cache_entry structsJameson Miller1-1/+1
2018-07-03read-cache: teach make_cache_entry to take object_idJameson Miller1-1/+1
2018-07-03read-cache: teach refresh_cache_entry to take istateJameson Miller1-1/+1
2018-06-29tag: add repository argument to deref_tagStefan Beller1-1/+2
2018-06-29commit: add repository argument to lookup_commit_referenceStefan Beller1-3/+3
2018-06-29tree: add repository argument to lookup_treeStefan Beller1-3/+3
2018-06-29object: add repository argument to parse_objectStefan Beller1-1/+3
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano1-0/+1
2018-06-25Merge branch 'sb/object-store-alloc'Junio C Hamano1-1/+2
2018-06-25Merge branch 'nd/commit-util-to-slab'Junio C Hamano1-3/+5
2018-06-18Merge branch 'en/rename-directory-detection'Junio C Hamano1-5/+5
2018-06-14merge-recursive: use xstrdup() instead of fixed bufferRené Scharfe1-5/+5
2018-06-13Merge branch 'sb/submodule-merge-in-merge-recursive'Junio C Hamano1-2/+2
2018-06-12merge-recursive: add pointer about unduly complex looking codeElijah Newren1-0/+15
2018-06-12merge-recursive: rename conflict_rename_*() family of functionsElijah Newren1-43/+43
2018-06-12merge-recursive: clarify the rename_dir/RENAME_DIR meaningElijah Newren1-11/+17
2018-06-12merge-recursive: align labels with their respective code blocksElijah Newren1-3/+3
2018-06-12merge-recursive: fix numerous argument alignment issuesElijah Newren1-37/+38
2018-06-12merge-recursive: fix miscellaneous grammar error in commentElijah Newren1-1/+1
2018-06-11merge-submodule: reduce output verbosityLeif Middelschulte1-2/+2
2018-05-30Merge branch 'ma/unpack-trees-free-msgs'Junio C Hamano1-14/+16
2018-05-30Merge branch 'sb/submodule-merge-in-merge-recursive'Junio C Hamano1-3/+182
2018-05-30Merge branch 'js/use-bug-macro'Junio C Hamano1-6/+6
2018-05-30Merge branch 'bp/merge-rename-config'Junio C Hamano1-6/+25
2018-05-23Merge branch 'en/rename-directory-detection-reboot'Junio C Hamano1-170/+1262
2018-05-23Merge branch 'ds/lazy-load-trees'Junio C Hamano1-2/+3
2018-05-22unpack_trees_options: free messages when doneMartin Ågren1-0/+1
2018-05-21merge: use commit-slab in merge remote desc instead of commit->utilNguyễn Thái Ngọc Duy1-3/+5
2018-05-21merge-recursive: provide pair of `unpack_trees_{start,finish}()`Elijah Newren1-14/+15
2018-05-18merge-recursive: give notice when submodule commit gets fast-forwardedLeif Middelschulte1-0/+16
2018-05-16object-store: move object access functions to object-store.hStefan Beller1-0/+1
2018-05-16alloc: allow arbitrary repositories for alloc functionsStefan Beller1-0/+1
2018-05-16merge-recursive: i18n submodule merge output and respect verbosityStefan Beller1-18/+15
2018-05-16submodule.c: move submodule merging to merge-recursive.cStefan Beller1-0/+166
2018-05-09alloc: add repository argument to alloc_commit_nodeStefan Beller1-1/+1
2018-05-08merge: pass aggressive when rename detection is turned offBen Peart1-0/+1
2018-05-08merge: add merge.renames config settingBen Peart1-6/+24
2018-05-08merge-recursive: fix check for skipability of working tree updatesElijah Newren1-16/+32
2018-05-08merge-recursive: make "Auto-merging" comment show for other mergesElijah Newren1-26/+39
2018-05-08merge-recursive: fix remainder of was_dirty() to use original indexElijah Newren1-3/+3
2018-05-08merge-recursive: fix was_tracked() to quit lying with some renamed pathsElijah Newren1-24/+67
2018-05-08merge-recursive: avoid triggering add_cacheinfo error with dirty modElijah Newren1-1/+1
2018-05-08merge-recursive: move more is_dirty handling to merge_contentElijah Newren1-18/+12
2018-05-08merge-recursive: improve add_cacheinfo error handlingElijah Newren1-5/+8
2018-05-08merge-recursive: avoid spurious rename/rename conflict from dir renamesElijah Newren1-2/+2
2018-05-08merge-recursive: fix remaining directory rename + dirty overwrite casesElijah Newren1-3/+22
2018-05-08merge-recursive: fix overwriting dirty files involved in renamesElijah Newren1-19/+66
2018-05-08merge-recursive: avoid clobbering untracked files with directory renamesElijah Newren1-2/+40
2018-05-08merge-recursive: apply necessary modifications for directory renamesElijah Newren1-1/+186
2018-05-08merge-recursive: when comparing files, don't include treesElijah Newren1-6/+21
2018-05-08merge-recursive: check for file level conflicts then get new nameElijah Newren1-8/+166
2018-05-08merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren1-3/+143
2018-05-08merge-recursive: check for directory level conflictsElijah Newren1-0/+119
2018-05-08merge-recursive: add get_directory_renames()Elijah Newren1-3/+221
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin1-6/+6
2018-04-20merge-recursive: make a helper function for cleanup for handle_renamesElijah Newren1-10/+13
2018-04-20merge-recursive: split out code for determining diff_filepairsElijah Newren1-22/+62
2018-04-20merge-recursive: make !o->detect_rename codepath more obviousElijah Newren1-2/+9
2018-04-20merge-recursive: fix leaks of allocated renames and diff_filepairsElijah Newren1-5/+15
2018-04-20merge-recursive: introduce new functions to handle rename logicElijah Newren1-10/+33
2018-04-20merge-recursive: move the get_renames() functionElijah Newren1-69/+70
2018-04-11Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano1-1132/+111
2018-04-11treewide: replace maybe_tree with accessor methodsDerrick Stolee1-2/+2
2018-04-11treewide: rename tree to maybe_treeDerrick Stolee1-2/+3
2018-04-10Merge branch 'bc/object-id'Junio C Hamano1-19/+19
2018-04-10Merge branch 'en/rename-directory-detection'Junio C Hamano1-111/+1132
2018-03-21Merge branch 'rj/warning-uninitialized-fix'Junio C Hamano1-1/+1
2018-03-20-Wuninitialized: remove some 'init-self' workaroundsRamsay Jones1-1/+1
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson1-2/+2
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-05 16:32:39 +0000