ll-merge: warn about inability to merge binary files only when we can't
When a path being merged is auto detected to be a binary file, we warned "Cannot merge binary files" before switching to activate the binary ll-merge driver. When we are merging with the -Xours/theirs option, however, we know what the "clean" merge result is, and the warning is inappropriate. In addition, when the path is explicitly marked as a binary file, this warning was not issued, even though without -Xours/theirs, we cannot cleanly automerge such a path, which was inconsistent. Move the warning code from ll_xdl_merge() to ll_binary_merge(), and issue the message only when we cannot cleanly automerge. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Sep 12, 2012 at 02:01 UTC
e0e2065f74500119d5e12524992273de362acd30
1 file changed
+4
-3
ll-merge.c
+4
-3
@@ -35,7 +35,7 @@ struct ll_merge_driver {
35
*/
36
static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
37
mmbuffer_t *result,
38
- const char *path_unused,
38
+ const char *path,
39
mmfile_t *orig, const char *orig_name,
40
mmfile_t *src1, const char *name1,
41
mmfile_t *src2, const char *name2,
@@ -53,6 +53,9 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
53
} else {
54
switch (opts->variant) {
55
default:
56
+ warning("Cannot merge binary files: %s (%s vs. %s)\n",
57
+ path, name1, name2);
58
+ /* fallthru */
59
case XDL_MERGE_FAVOR_OURS:
60
stolen = src1;
61
break;
@@ -88,8 +91,6 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
91
if (buffer_is_binary(orig->ptr, orig->size) ||
92
buffer_is_binary(src1->ptr, src1->size) ||
93
buffer_is_binary(src2->ptr, src2->size)) {
91
- warning("Cannot merge binary files: %s (%s vs. %s)\n",
92
- path, name1, name2);
94
return ll_binary_merge(drv_unused, result,
95
path,
96
orig, orig_name,