mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle_one_ref(): rewrite to take an object_id argument

Browse Source 
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>
This commit is contained in:
Michael Haggerty
2015-05-25 18:39:05 +00:00
committed by Junio C Hamano
parent e2b0bcdf4a
commit 9c5fe0b846
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sha1_name.c
View File

@ -831,11 +831,11 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned l
/* Remember to update object flag allocation in object.h */ /* Remember to update object flag allocation in object.h */
#define ONELINE_SEEN (1u<<20) #define ONELINE_SEEN (1u<<20)
static int handle_one_ref(const char *path, static int handle_one_ref(const char *path, const struct object_id *oid,
const unsigned char *sha1, int flag, void *cb_data) int flag, void *cb_data)
{ {
struct commit_list **list = cb_data; struct commit_list **list = cb_data;
struct object *object = parse_object(sha1); struct object *object = parse_object(oid->hash);
if (!object) if (!object)
return 0; return 0;
if (object->type == OBJ_TAG) { if (object->type == OBJ_TAG) {
@ -1371,10 +1371,8 @@ static int get_sha1_with_context_1(const char *name,
int pos; int pos;
if (!only_to_die && namelen > 2 && name[1] == '/') { if (!only_to_die && namelen > 2 && name[1] == '/') {
struct commit_list *list = NULL; struct commit_list *list = NULL;
struct each_ref_fn_sha1_adapter wrapped_handle_one_ref =
{handle_one_ref, &list};
for_each_ref(each_ref_fn_adapter, &wrapped_handle_one_ref); for_each_ref(handle_one_ref, &list);
commit_list_sort_by_date(&list); commit_list_sort_by_date(&list);
return get_sha1_oneline(name + 2, sha1, list); return get_sha1_oneline(name + 2, sha1, list);
} }