git_attr(): fix function signature

diff --git a/ll-merge.c b/ll-merge.c
index 0571564ddfb336247c8268fbdecd8674d8bacd3e..f4b0a0737723d879b1ddfea9376f1644bff029c7 100644 (file)
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -192,10 +192,6 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
 
        args[2] = cmd.buf;
        status = run_command_v_opt(args, 0);
-       if (status < -ERR_RUN_COMMAND_FORK)
-               ; /* failure in run-command */
-       else
-               status = -status;
        fd = open(temp[1], O_RDONLY);
        if (fd < 0)
                goto bad;
@@ -348,7 +344,7 @@ static const char *git_path_check_merge(const char *path)
        static struct git_attr_check attr_merge_check;
 
        if (!attr_merge_check.attr)
-               attr_merge_check.attr = git_attr("merge", 5);
+               attr_merge_check.attr = git_attr("merge");
 
        if (git_checkattr(path, 1, &attr_merge_check))
                return NULL;