xdl_merge(): allow passing down marker_size in xmparam_t

diff --git a/convert.c b/convert.c
index 1816e977b7b13782003fc78a9de9b47cd3554a32..852fd6488aa44d25a9219bebc09990477354d168 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -267,7 +267,7 @@ static int filter_buffer(int fd, void *data)
 
        status = finish_command(&child_process);
        if (status)
-               error("external filter %s failed %d", params->cmd, -status);
+               error("external filter %s failed %d", params->cmd, status);
        return (write_err || status);
 }
 
@@ -377,9 +377,9 @@ static void setup_convert_check(struct git_attr_check *check)
        static struct git_attr *attr_filter;
 
        if (!attr_crlf) {
-               attr_crlf = git_attr("crlf", 4);
-               attr_ident = git_attr("ident", 5);
-               attr_filter = git_attr("filter", 6);
+               attr_crlf = git_attr("crlf");
+               attr_ident = git_attr("ident");
+               attr_filter = git_attr("filter");
                user_convert_tail = &user_convert;
                git_config(read_convert_config, NULL);
        }