diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-01-23 13:39:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-23 13:39:51 -0800 |
| commit | 577bff3a81079ebaf278eb98e10453f65678c135 (patch) | |
| tree | bbe1b3145d33b4b282ddef7445646812d226e373 /userdiff.c | |
| parent | 8a40af9cabe2efbb830bf90c864ffda3136926ba (diff) | |
| parent | 47cfc9bd7d0add617cf6d928e96b7d207be614f1 (diff) | |
| download | git-577bff3a81079ebaf278eb98e10453f65678c135.tar.xz | |
Merge branch 'kn/attr-from-tree'
"git check-attr" learned to take an optional tree-ish to read the
.gitattributes file from.
* kn/attr-from-tree:
attr: add flag `--source` to work with tree-ish
t0003: move setup for `--all` into new block
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 e25356a061..d71b82feb7 100644 --- a/userdiff.c +++ b/userdiff.c @@ -413,7 +413,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, path, check); + git_check_attr(istate, NULL, path, check); if (ATTR_TRUE(check->items[0].value)) return &driver_true; |