handle_one_ref(): 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>
Michael Haggerty committed
May 25, 2015 at 18:39 UTC
9c5fe0b846c1abe5655f6885c83437adc979d022
1 file changed
+4
-6
sha1_name.c
+4
-6
@@ -831,11 +831,11 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned l
831
/* Remember to update object flag allocation in object.h */
832
#define ONELINE_SEEN (1u<<20)
833
834
-static int handle_one_ref(const char *path,
835
- const unsigned char *sha1, int flag, void *cb_data)
834
+static int handle_one_ref(const char *path, const struct object_id *oid,
835
+ int flag, void *cb_data)
836
{
837
struct commit_list **list = cb_data;
838
- struct object *object = parse_object(sha1);
838
+ struct object *object = parse_object(oid->hash);
839
if (!object)
840
return 0;
841
if (object->type == OBJ_TAG) {
@@ -1371,10 +1371,8 @@ static int get_sha1_with_context_1(const char *name,
1371
int pos;
1372
if (!only_to_die && namelen > 2 && name[1] == '/') {
1373
struct commit_list *list = NULL;
1374
- struct each_ref_fn_sha1_adapter wrapped_handle_one_ref =
1375
- {handle_one_ref, &list};
1374
1377
- for_each_ref(each_ref_fn_adapter, &wrapped_handle_one_ref);
1375
+ for_each_ref(handle_one_ref, &list);
1376
commit_list_sort_by_date(&list);
1377
return get_sha1_oneline(name + 2, sha1, list);
1378
}