[PATCH 25/37] merge-recursive: Update merge_content() call signature
- From
Elijah Newren <newren@gmail.com>
- Date
- Sep 20, 2010, 08:28 UTC
- Message-ID
- <1284971350-30590-26-git-send-email-newren@gmail.com>
- In-Reply-To
- <1284971350-30590-1-git-send-email-newren@gmail.com>
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