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

grab_single_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:36 +00:00 committed by Junio C Hamano
parent 0e0b7de4c7
commit 30a3fd4050
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/for-each-ref.c
View File

@ -840,7 +840,8 @@ struct grab_ref_cbdata {
* A call-back given to for_each_ref(). Filter refs and keep them for * A call-back given to for_each_ref(). Filter refs and keep them for
* later object processing. * later object processing.
*/ */
static int grab_single_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) static int grab_single_ref(const char *refname, const struct object_id *oid,
int flag, void *cb_data)
{ {
struct grab_ref_cbdata *cb = cb_data; struct grab_ref_cbdata *cb = cb_data;
struct refinfo *ref; struct refinfo *ref;
@ -878,7 +879,7 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f
*/ */
ref = xcalloc(1, sizeof(*ref)); ref = xcalloc(1, sizeof(*ref));
ref->refname = xstrdup(refname); ref->refname = xstrdup(refname);
hashcpy(ref->objectname, sha1); hashcpy(ref->objectname, oid->hash);
ref->flag = flag; ref->flag = flag;


cnt = cb->grab_cnt; cnt = cb->grab_cnt;
@ -1072,8 +1073,6 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
int maxcount = 0, quote_style = 0; int maxcount = 0, quote_style = 0;
struct refinfo **refs; struct refinfo **refs;
struct grab_ref_cbdata cbdata; struct grab_ref_cbdata cbdata;
struct each_ref_fn_sha1_adapter wrapped_grab_single_ref =
{grab_single_ref, &cbdata};


struct option opts[] = { struct option opts[] = {
OPT_BIT('s', "shell", &quote_style, OPT_BIT('s', "shell", &quote_style,
@ -1113,7 +1112,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)


memset(&cbdata, 0, sizeof(cbdata)); memset(&cbdata, 0, sizeof(cbdata));
cbdata.grab_pattern = argv; cbdata.grab_pattern = argv;
for_each_rawref(each_ref_fn_adapter, &wrapped_grab_single_ref); for_each_rawref(grab_single_ref, &cbdata);
refs = cbdata.grab_array; refs = cbdata.grab_array;
num_refs = cbdata.grab_cnt; num_refs = cbdata.grab_cnt;