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 /builtin/pack-objects.c | |
| parent | 3307f7dde2ae8f5281d0782f7291a073c9b1cdc2 (diff) | |
| parent | 44451a2e5eec5360378be23e2cdbd9ecee49e14e (diff) | |
| download | git-67a3b2b39f638872531324e03217fa58f7b9ad1e.tar.gz | |
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 '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 a5b466839b..9cfc8801f9 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1331,7 +1331,7 @@ static int no_try_delta(const char *path) if (!check) check = attr_check_initl("delta", NULL); - git_check_attr(the_repository->index, NULL, path, check); + git_check_attr(the_repository->index, path, check); if (ATTR_FALSE(check->items[0].value)) return 1; return 0; |