merge-recursive: Update merge_content() call signature
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Sep 20, 2010 at 02:28 UTC
61b8bcae2d8f71c566150b0a12e35a9fdc76b82b
1 file changed
+4
-2
merge-recursive.c
+4
-2
@@ -1214,7 +1214,8 @@ static int merge_content(struct merge_options *o,
1214
const char *path,
1215
unsigned char *o_sha, int o_mode,
1216
unsigned char *a_sha, int a_mode,
1217
- unsigned char *b_sha, int b_mode)
1217
+ unsigned char *b_sha, int b_mode,
1218
+ const char *df_rename_conflict_branch)
1219
{
1220
const char *reason = "content";
1221
struct merge_file_info mfi;
@@ -1322,7 +1323,8 @@ static int process_entry(struct merge_options *o,
1323
/* Case C: Added in both (check for same permissions) and */
1324
/* case D: Modified in both, but differently. */
1325
clean_merge = merge_content(o, path,
1325
- o_sha, o_mode, a_sha, a_mode, b_sha, b_mode);
1326
+ o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
1327
+ NULL);
1328
} else if (!o_sha && !a_sha && !b_sha) {
1329
/*
1330
* this entry was deleted altogether. a_mode == 0 means