diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2015-05-25 18:38:38 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-25 12:19:29 -0700 |
| commit | d155254c73cfa5cbd82e8ad97840e4c9dbf762b0 (patch) | |
| tree | c98c30a36d3b8b017f175b709fe7907a06282883 /builtin/pack-objects.c | |
| parent | 73868486f0ef6c5572681913fc2d204f12846bc5 (diff) | |
| download | git-d155254c73cfa5cbd82e8ad97840e4c9dbf762b0.tar.gz | |
builtin/pack-objects: rewrite to take an object_id argument
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 81f0e57c5a..80fe8c7dc1 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -540,11 +540,11 @@ static enum write_one_status write_one(struct sha1file *f, return WRITE_ONE_WRITTEN; } -static int mark_tagged(const char *path, const unsigned char *sha1, int flag, +static int mark_tagged(const char *path, const struct object_id *oid, int flag, void *cb_data) { unsigned char peeled[20]; - struct object_entry *entry = packlist_find(&to_pack, sha1, NULL); + struct object_entry *entry = packlist_find(&to_pack, oid->hash, NULL); if (entry) entry->tagged = 1; @@ -626,8 +626,6 @@ static struct object_entry **compute_write_order(void) struct object_entry **wo = xmalloc(to_pack.nr_objects * sizeof(*wo)); struct object_entry *objects = to_pack.objects; - struct each_ref_fn_sha1_adapter wrapped_mark_tagged = - {mark_tagged, NULL}; for (i = 0; i < to_pack.nr_objects; i++) { objects[i].tagged = 0; @@ -653,7 +651,7 @@ static struct object_entry **compute_write_order(void) /* * Mark objects that are at the tip of tags. */ - for_each_tag_ref(each_ref_fn_adapter, &wrapped_mark_tagged); + for_each_tag_ref(mark_tagged, NULL); /* * Give the objects in the original recency order until @@ -2099,14 +2097,14 @@ static void ll_find_deltas(struct object_entry **list, unsigned list_size, #define ll_find_deltas(l, s, w, d, p) find_deltas(l, &s, w, d, p) #endif -static int add_ref_tag(const char *path, const unsigned char *sha1, int flag, void *cb_data) +static int add_ref_tag(const char *path, const struct object_id *oid, int flag, void *cb_data) { - unsigned char peeled[20]; + struct object_id peeled; if (starts_with(path, "refs/tags/") && /* is a tag? */ - !peel_ref(path, peeled) && /* peelable? */ - packlist_find(&to_pack, peeled, NULL)) /* object packed? */ - add_object_entry(sha1, OBJ_TAG, NULL, 0); + !peel_ref(path, peeled.hash) && /* peelable? */ + packlist_find(&to_pack, peeled.hash, NULL)) /* object packed? */ + add_object_entry(oid->hash, OBJ_TAG, NULL, 0); return 0; } @@ -2786,12 +2784,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) argv_array_clear(&rp); } cleanup_preferred_base(); - if (include_tag && nr_result) { - struct each_ref_fn_sha1_adapter wrapped_add_ref_tag = - {add_ref_tag, NULL}; - - for_each_ref(each_ref_fn_adapter, &wrapped_add_ref_tag); - } + if (include_tag && nr_result) + for_each_ref(add_ref_tag, NULL); stop_progress(&progress_state); if (non_empty && !nr_result) |