attr: add flag `--source` to work with tree-ish

[thirdparty/git.git] / ll-merge.c

diff --git a/ll-merge.c b/ll-merge.c
index 22a603e8af402d11fff97172d3f3ded3a9849cd4..130d26501c69cd47b762f13b46ff4835cfa6261a 100644 (file)
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -391,7 +391,7 @@ enum ll_merge_result ll_merge(mmbuffer_t *result_buf,
                normalize_file(theirs, path, istate);
        }
 
-       git_check_attr(istate, path, check);
+       git_check_attr(istate, NULL, path, check);
        ll_driver_name = check->items[0].value;
        if (check->items[1].value) {
                marker_size = atoi(check->items[1].value);
@@ -419,7 +419,7 @@ int ll_merge_marker_size(struct index_state *istate, const char *path)
 
        if (!check)
                check = attr_check_initl("conflict-marker-size", NULL);
-       git_check_attr(istate, path, check);
+       git_check_attr(istate, NULL, path, check);
        if (check->items[0].value) {
                marker_size = atoi(check->items[0].value);
                if (marker_size <= 0)