kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

append_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>
maint
Michael Haggerty 2015-05-25 18:38:32 +00:00 committed by Junio C Hamano
parent eed2514802
commit a55ce97185
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/branch.c
View File

@ -328,7 +328,7 @@ static int match_patterns(const char **pattern, const char *refname)
return 0; return 0;
} }


static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data) static int append_ref(const char *refname, const struct object_id *oid, int flags, void *cb_data)
{ {
struct append_ref_cb *cb = (struct append_ref_cb *)(cb_data); struct append_ref_cb *cb = (struct append_ref_cb *)(cb_data);
struct ref_list *ref_list = cb->ref_list; struct ref_list *ref_list = cb->ref_list;
@ -365,7 +365,7 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,


commit = NULL; commit = NULL;
if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) { if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) {
commit = lookup_commit_reference_gently(sha1, 1); commit = lookup_commit_reference_gently(oid->hash, 1);
if (!commit) { if (!commit) {
cb->ret = error(_("branch '%s' does not point at a commit"), refname); cb->ret = error(_("branch '%s' does not point at a commit"), refname);
return 0; return 0;
@ -631,8 +631,6 @@ static int print_ref_list(int kinds, int detached, int verbose, int abbrev, stru
int i; int i;
struct append_ref_cb cb; struct append_ref_cb cb;
struct ref_list ref_list; struct ref_list ref_list;
struct each_ref_fn_sha1_adapter wrapped_append_ref =
{append_ref, &cb};


memset(&ref_list, 0, sizeof(ref_list)); memset(&ref_list, 0, sizeof(ref_list));
ref_list.kinds = kinds; ref_list.kinds = kinds;
@ -644,7 +642,7 @@ static int print_ref_list(int kinds, int detached, int verbose, int abbrev, stru
cb.ref_list = &ref_list; cb.ref_list = &ref_list;
cb.pattern = pattern; cb.pattern = pattern;
cb.ret = 0; cb.ret = 0;
for_each_rawref(each_ref_fn_adapter, &wrapped_append_ref); for_each_rawref(append_ref, &cb);
if (merge_filter != NO_FILTER) { if (merge_filter != NO_FILTER) {
struct commit *filter; struct commit *filter;
filter = lookup_commit_reference_gently(merge_filter_ref, 0); filter = lookup_commit_reference_gently(merge_filter_ref, 0);