From: Elijah Newren Date: Mon, 20 Sep 2010 08:28:58 +0000 (-0600) Subject: merge-recursive: Update merge_content() call signature X-Git-Tag: v1.7.4-rc0~101^2~14 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=61b8bcae2d8f71c566150b0a12e35a9fdc76b82b;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/merge-recursive.c b/merge-recursive.c index 691c97c33..b9bc95a65 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