diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-05-17 10:11:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-05-17 10:11:41 -0700 |
| commit | 67a3b2b39f638872531324e03217fa58f7b9ad1e (patch) | |
| tree | 5c4e9c7b9e2c0efc9c9f9e7e70fb11b104f95890 /userdiff.c | |
| parent | 3307f7dde2ae8f5281d0782f7291a073c9b1cdc2 (diff) | |
| parent | 44451a2e5eec5360378be23e2cdbd9ecee49e14e (diff) | |
Merge branch 'jc/attr-source-tree'
"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 'userdiff.c')
| -rw-r--r-- | userdiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c index eaec6ebb5e..664c7c1402 100644 --- a/userdiff.c +++ b/userdiff.c @@ -444,7 +444,7 @@ struct userdiff_driver *userdiff_find_by_path(struct index_state *istate, check = attr_check_initl("diff", NULL); if (!path) return NULL; - git_check_attr(istate, NULL, path, check); + git_check_attr(istate, path, check); if (ATTR_TRUE(check->items[0].value)) return &driver_true; |