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 /builtin/pack-objects.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 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 2193f80b89..cabace4abb 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1318,7 +1318,7 @@ static int no_try_delta(const char *path) if (!check) check = attr_check_initl("delta", NULL); - git_check_attr(the_repository->index, path, check); + git_check_attr(the_repository->index, NULL, path, check); if (ATTR_FALSE(check->items[0].value)) return 1; return 0; |