diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-01-24 00:39:50 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-01-24 00:39:51 +0300 |
commit | 577bff3a81079ebaf278eb98e10453f65678c135 (patch) | |
tree | bbe1b3145d33b4b282ddef7445646812d226e373 /ws.c | |
parent | 8a40af9cabe2efbb830bf90c864ffda3136926ba (diff) | |
parent | 47cfc9bd7d0add617cf6d928e96b7d207be614f1 (diff) |
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 'ws.c')
-rw-r--r-- | ws.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -79,7 +79,7 @@ unsigned whitespace_rule(struct index_state *istate, const char *pathname) if (!attr_whitespace_rule) attr_whitespace_rule = attr_check_initl("whitespace", NULL); - git_check_attr(istate, pathname, attr_whitespace_rule); + git_check_attr(istate, NULL, pathname, attr_whitespace_rule); value = attr_whitespace_rule->items[0].value; if (ATTR_TRUE(value)) { /* true (whitespace) */ |