diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-02-22 00:47:32 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-22 19:12:15 +0100 |
| commit | 9461d27240c158cf781ce706a077663050179b14 (patch) | |
| tree | b7cd7ab70db3881689f8afb068c3a4a25f4f5784 /builtin/merge-base.c | |
| parent | reflog-walk: convert struct reflog_info to struct object_id (diff) | |
| download | git-9461d27240c158cf781ce706a077663050179b14.tar.xz git-9461d27240c158cf781ce706a077663050179b14.zip | |
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 'builtin/merge-base.c')
| -rw-r--r-- | builtin/merge-base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/merge-base.c b/builtin/merge-base.c index b572a37c26..db95bc29cf 100644 --- a/builtin/merge-base.c +++ b/builtin/merge-base.c @@ -131,7 +131,7 @@ static void add_one_commit(unsigned char *sha1, struct rev_collect *revs) commit->object.flags |= TMP_MARK; } -static int collect_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1, +static int collect_one_reflog_ent(struct object_id *ooid, struct object_id *noid, const char *ident, unsigned long timestamp, int tz, const char *message, void *cbdata) { @@ -139,9 +139,9 @@ static int collect_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1, if (revs->initial) { revs->initial = 0; - add_one_commit(osha1, revs); + add_one_commit(ooid->hash, revs); } - add_one_commit(nsha1, revs); + add_one_commit(noid->hash, revs); return 0; } |