Skip to content

Cleanup of merge_*() functions in merge-recursive

Elijah Newren git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest4 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4merge-recursive: set paths correctly when three-way merging contentmerge-recursive.c+9 -400 replies
2/4merge-recursive: avoid wrapper function when unnecessary and wastefulmerge-recursive.c+1 -40 replies
3/4merge-recursive: remove final remaining caller of merge_file_one()merge-recursive.c+17 -270 replies
4/4merge-recursive: rename merge_file_1() and merge_content()merge-recursive.c+34 -321 reply

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/4] Cleanup of merge_*() functions in merge-recursive

While working on a series to make file collision conflict handling consistent, I discovered a latent bug in merge_content()...and several opportunities for cleanup. This series fixes that bug, deletes the merge_file_special_markers() and merge_file_one() functions, and renames a pair of functions to make them have a better description.

Elijah Newren (4):
merge-recursive: set paths correctly when three-way merging content
merge-recursive: avoid wrapper function when unnecessary and wasteful
merge-recursive: remove final remaining caller of merge_file_one()
merge-recursive: rename merge_file_1() and merge_content()

 merge-recursive.c | 144 ++++++++++++++++------------------------------
 1 file changed, 51 insertions(+), 93 deletions(-)
Signature · 1 line
2.19.0.12.gc6760fd9a9