Home » Mailing list archives » git » 2010 » September » 20

[PATCH 25/37] merge-recursive: Update merge_content() call signature

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Elijah Newren
Subject: [PATCH 25/37] merge-recursive: Update merge_content() call signature
Date: Monday, September 20, 2010 - 1:28 am

Enable calling merge_content() and providing more information about renames
and D/F conflicts (which we will want to do from process_df_entry()).

Signed-off-by: Elijah Newren <newren@gmail.com>
---
 merge-recursive.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/merge-recursive.c b/merge-recursive.c
index 237d1ac..5f528c1 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1214,7 +1214,8 @@ static int merge_content(struct merge_options *o,
 			 const char *path,
 			 unsigned char *o_sha, int o_mode,
 			 unsigned char *a_sha, int a_mode,
-			 unsigned char *b_sha, int b_mode)
+			 unsigned char *b_sha, int b_mode,
+			 const char *df_rename_conflict_branch)
 {
 	const char *reason = "content";
 	struct merge_file_info mfi;
@@ -1322,7 +1323,8 @@ static int process_entry(struct merge_options *o,
 		/* Case C: Added in both (check for same permissions) and */
 		/* case D: Modified in both, but differently. */
 		clean_merge = merge_content(o, path,
-					    o_sha, o_mode, a_sha, a_mode, b_sha, b_mode);
+					    o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
+					    NULL);
 	} else if (!o_sha && !a_sha && !b_sha) {
 		/*
 		 * this entry was deleted altogether. a_mode == 0 means
-- 
1.7.3.271.g16009

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 00/37] Audit and fix corner case bugs in recursive ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 01/37] t3030: Add a testcase for resolvable rename/ ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 02/37] merge-recursive: Restructure showing how to ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 03/37] t6032: Add a test checking for excessive out ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 04/37] t6022: Add test combinations of {content con ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 05/37] t6022: Add tests for reversing order of merg ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 06/37] t6022: Add tests with both rename source &amp; d ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 07/37] t6022: Add paired rename+D/F conflict: (two/ ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 08/37] t6022: Add tests for rename/rename combined ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 09/37] t6020: Modernize style a bit, Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 10/37] t6020: Add a testcase for modify/delete + di ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 11/37] t6036: Test index and worktree state, not ju ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 12/37] t6036: Add a second testcase similar to the ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 13/37] t6036: Add testcase for undetected conflict, Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 14/37] merge-recursive: Small code clarification -- ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 15/37] merge-recursive: Rename conflict_rename_rena ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 16/37] merge-recursive: Nuke rename/directory confl ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 17/37] merge-recursive: Move rename/delete handling ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 18/37] merge-recursive: Move delete/modify handling ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 19/37] merge-recursive: Move process_entry's conten ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 20/37] merge-recursive: New data structures for def ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 21/37] merge-recursive: New function to assist reso ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 22/37] merge-recursive: Have process_entry() skip D ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 23/37] merge-recursive: Structure process_df_entry( ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 24/37] merge-recursive: Update conflict_rename_rena ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 25/37] merge-recursive: Update merge_content() call ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 26/37] merge-recursive: Avoid doubly merging rename ..., Elijah Newren, (Mon Sep 20, 1:28 am)
[PATCH 27/37] merge-recursive: Move handling of double ren ..., Elijah Newren, (Mon Sep 20, 1:29 am)
[PATCH 28/37] merge-recursive: Move handling of double ren ..., Elijah Newren, (Mon Sep 20, 1:29 am)
[PATCH 29/37] merge-recursive: Delay handling of rename/de ..., Elijah Newren, (Mon Sep 20, 1:29 am)
[PATCH 30/37] merge-recursive: Delay content merging for r ..., Elijah Newren, (Mon Sep 20, 1:29 am)
[PATCH 31/37] merge-recursive: Delay modify/delete conflic ..., Elijah Newren, (Mon Sep 20, 1:29 am)
[PATCH 32/37] conflict_rename_delete(): Check whether D/F ..., Elijah Newren, (Mon Sep 20, 1:29 am)
[PATCH 33/37] conflict_rename_rename_1to2(): Fix checks fo ..., Elijah Newren, (Mon Sep 20, 1:29 am)
[PATCH 34/37] merge_content(): Check whether D/F conflicts ..., Elijah Newren, (Mon Sep 20, 1:29 am)
[PATCH 35/37] handle_delete_modify(): Check whether D/F co ..., Elijah Newren, (Mon Sep 20, 1:29 am)
[PATCH 36/37] merge-recursive: Make room for directories i ..., Elijah Newren, (Mon Sep 20, 1:29 am)
[PATCH 37/37] merge-recursive: Remove redundant path clear ..., Elijah Newren, (Mon Sep 20, 1:29 am)
Re: [PATCH 01/37] t3030: Add a testcase for resolvable ren ..., Johannes Sixt, (Mon Sep 20, 2:15 am)
Re: [PATCH 09/37] t6020: Modernize style a bit, Johannes Sixt, (Mon Sep 20, 2:24 am)
Re: [PATCH 01/37] t3030: Add a testcase for resolvable ren ..., Jakub Narebski, (Mon Sep 20, 2:34 am)
Re: [PATCH 36/37] merge-recursive: Make room for directori ..., Johannes Sixt, (Mon Sep 20, 4:40 am)
Re: [PATCH 09/37] t6020: Modernize style a bit, Elijah Newren, (Mon Sep 20, 9:03 am)
Re: [PATCH 36/37] merge-recursive: Make room for directori ..., Elijah Newren, (Mon Sep 20, 9:06 am)
Re: [PATCH 09/37] t6020: Modernize style a bit, Junio C Hamano, (Tue Sep 21, 6:44 pm)
Re: [PATCH 09/37] t6020: Modernize style a bit, Elijah Newren, (Tue Sep 21, 9:41 pm)