diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-15 14:55:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 14:55:43 -0800 |
| commit | 8be8342b4c47df386c6eced39922595d7dfdccc9 (patch) | |
| tree | 3fed16dd1602125435cf12a4c150698bb13bdf59 /builtin/pack-objects.c | |
| parent | Merge branch 'sb/pull-rebase-submodule' (diff) | |
| parent | sha1_file: rename hash_sha1_file_literally (diff) | |
| download | git-8be8342b4c47df386c6eced39922595d7dfdccc9.tar.gz git-8be8342b4c47df386c6eced39922595d7dfdccc9.zip | |
Merge branch 'po/object-id'
Conversion from uchar[20] to struct object_id continues.
* po/object-id:
sha1_file: rename hash_sha1_file_literally
sha1_file: convert write_loose_object to object_id
sha1_file: convert force_object_loose to object_id
sha1_file: convert write_sha1_file to object_id
notes: convert write_notes_tree to object_id
notes: convert combine_notes_* to object_id
commit: convert commit_tree* to object_id
match-trees: convert splice_tree to object_id
cache: clear whole hash buffer with oidclr
sha1_file: convert hash_sha1_file to object_id
dir: convert struct sha1_stat to use object_id
sha1_file: convert pretend_sha1_file to object_id
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 83dcbc9773..81ad914cfc 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2793,7 +2793,7 @@ static void loosen_unused_packed_objects(struct rev_info *revs) if (!packlist_find(&to_pack, oid.hash, NULL) && !has_sha1_pack_kept_or_nonlocal(&oid) && !loosened_object_can_be_discarded(&oid, p->mtime)) - if (force_object_loose(oid.hash, p->mtime)) + if (force_object_loose(&oid, p->mtime)) die("unable to force loose object"); } } |