diff options
| author | Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:58 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:03 -0700 |
| commit | 61b8bcae2d8f71c566150b0a12e35a9fdc76b82b (patch) | |
| tree | db82c5229fe0f9af93c694923ae97531ce5b5b6b /merge-recursive.c | |
| parent | 36de17048aaa3c3011c8b4ee1f89ee65b7ad2f99 (diff) | |
| download | git-61b8bcae2d8f71c566150b0a12e35a9fdc76b82b.tar.gz git-61b8bcae2d8f71c566150b0a12e35a9fdc76b82b.tar.xz | |
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>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 6 |
1 files changed, 4 insertions, 2 deletions
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 |