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 /ws.c | |
| parent | imap-send: include strbuf.h (diff) | |
| parent | attr: teach "--attr-source=<tree>" global option to "git" (diff) | |
| download | git-67a3b2b39f638872531324e03217fa58f7b9ad1e.tar.gz git-67a3b2b39f638872531324e03217fa58f7b9ad1e.zip | |
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 'ws.c')
| -rw-r--r-- | ws.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -83,7 +83,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, NULL, pathname, attr_whitespace_rule); + git_check_attr(istate, pathname, attr_whitespace_rule); value = attr_whitespace_rule->items[0].value; if (ATTR_TRUE(value)) { /* true (whitespace) */ |