diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-02-21 23:47:32 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-02-22 10:12:15 -0800 |
commit | 9461d27240c158cf781ce706a077663050179b14 (patch) | |
tree | b7cd7ab70db3881689f8afb068c3a4a25f4f5784 /revision.c | |
parent | 8ebc3fd01bcedcb9a442da1114f37d1a4b8869a0 (diff) | |
download | git-9461d27240c158cf781ce706a077663050179b14.tar.gz |
refs: convert each_reflog_ent_fn to struct object_id
Make each_reflog_ent_fn take two struct object_id pointers instead of
two pointers to unsigned char. Convert the various callbacks to use
struct object_id as well. Also, rename fsck_handle_reflog_sha1 to
fsck_handle_reflog_oid.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
-rw-r--r-- | revision.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/revision.c b/revision.c index b37dbec378..d9fe73318a 100644 --- a/revision.c +++ b/revision.c @@ -1196,11 +1196,11 @@ static void handle_refs(const char *submodule, struct rev_info *revs, unsigned f for_each(submodule, handle_one_ref, &cb); } -static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data) +static void handle_one_reflog_commit(struct object_id *oid, void *cb_data) { struct all_refs_cb *cb = cb_data; - if (!is_null_sha1(sha1)) { - struct object *o = parse_object(sha1); + if (!is_null_oid(oid)) { + struct object *o = parse_object(oid->hash); if (o) { o->flags |= cb->all_flags; /* ??? CMDLINEFLAGS ??? */ @@ -1214,12 +1214,12 @@ static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data) } } -static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1, +static int handle_one_reflog_ent(struct object_id *ooid, struct object_id *noid, const char *email, unsigned long timestamp, int tz, const char *message, void *cb_data) { - handle_one_reflog_commit(osha1, cb_data); - handle_one_reflog_commit(nsha1, cb_data); + handle_one_reflog_commit(ooid, cb_data); + handle_one_reflog_commit(noid, cb_data); return 0; } |