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

refs: convert each_reflog_ent_fn to struct object_id

Browse Source 
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>
This commit is contained in:
brian m. carlson
2017-02-21 23:47:32 +00:00
committed by Junio C Hamano
parent 8ebc3fd01b
commit 9461d27240
10 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/merge-base.c
View File

@ -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;
}