xdl_merge(): make XDL_MERGE_ZEALOUS output simpler

diff --git a/builtin-merge-file.c b/builtin-merge-file.c
index 913577390862a847857a650516740059072b60ad..58deb62ac08507901c40e89aec0cea7fcdc78f1e 100644 (file)
--- a/builtin-merge-file.c
+++ b/builtin-merge-file.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
 #include "cache.h"
 #include "xdiff/xdiff.h"
 #include "xdiff-interface.h"
@@ -5,9 +6,9 @@
 static const char merge_file_usage[] =
 "git merge-file [-p | --stdout] [-q | --quiet] [-L name1 [-L orig [-L name2]]] file1 orig_file file2";
 
-int cmd_merge_file(int argc, char **argv, char **envp)
+int cmd_merge_file(int argc, const char **argv, const char *prefix)
 {
-       char *names[3];
+       const char *names[3];
        mmfile_t mmfs[3];
        mmbuffer_t result = {NULL, 0};
        xpparam_t xpp = {XDF_NEED_MINIMAL};
@@ -36,9 +37,13 @@ int cmd_merge_file(int argc, char **argv, char **envp)
        for (; i < 3; i++)
                names[i] = argv[i + 1];
 
-       for (i = 0; i < 3; i++)
+       for (i = 0; i < 3; i++) {
                if (read_mmfile(mmfs + i, argv[i + 1]))
                        return -1;
+               if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size))
+                       return error("Cannot merge binary files: %s\n",
+                                       argv[i + 1]);
+       }
 
        ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2],
                        &xpp, XDL_MERGE_ZEALOUS, &result);
@@ -47,7 +52,7 @@ int cmd_merge_file(int argc, char **argv, char **envp)
                free(mmfs[i].ptr);
 
        if (ret >= 0) {
-               char *filename = argv[1];
+               const char *filename = argv[1];
                FILE *f = to_stdout ? stdout : fopen(filename, "wb");
 
                if (!f)