diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-05-10 11:36:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-05-10 11:36:45 -0700 |
| commit | cb94f4fba6e4f2a8166d94453bb21cdb1c600c4c (patch) | |
| tree | 0c4e4fa5979a5921885f338ea014d9f74b96125c /ll-merge.c | |
| parent | 2980db981eebefa24d6425a00fa4dab9f3b35da3 (diff) | |
| parent | 44451a2e5eec5360378be23e2cdbd9ecee49e14e (diff) | |
| download | git-cb94f4fba6e4f2a8166d94453bb21cdb1c600c4c.tar.gz | |
Merge branch 'jc/attr-source-tree' into next
"git --attr-source=<tree> cmd $args" is a new way to have any
command to read attributes not from the working tree but from the
given tree object.
* jc/attr-source-tree:
attr: teach "--attr-source=<tree>" global option to "git"
Diffstat (limited to 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ll-merge.c b/ll-merge.c index 1993530688..07ec16e8e5 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -394,7 +394,7 @@ enum ll_merge_result ll_merge(mmbuffer_t *result_buf, normalize_file(theirs, path, istate); } - git_check_attr(istate, NULL, path, check); + git_check_attr(istate, path, check); ll_driver_name = check->items[0].value; if (check->items[1].value) { marker_size = atoi(check->items[1].value); @@ -422,7 +422,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, NULL, path, check); + git_check_attr(istate, path, check); if (check->items[0].value) { marker_size = atoi(check->items[0].value); if (marker_size <= 0) |