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 /wt-status.c | |
| parent | reflog-walk: convert struct reflog_info to struct object_id (diff) | |
| download | tgif-9461d27240c158cf781ce706a077663050179b14.tar.xz | |
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 'wt-status.c')
| -rw-r--r-- | wt-status.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wt-status.c b/wt-status.c index 0ec090a338..5fac8437b0 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1373,7 +1373,7 @@ struct grab_1st_switch_cbdata { unsigned char nsha1[20]; }; -static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1, +static int grab_1st_switch(struct object_id *ooid, struct object_id *noid, const char *email, unsigned long timestamp, int tz, const char *message, void *cb_data) { @@ -1387,13 +1387,13 @@ static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1, return 0; target += strlen(" to "); strbuf_reset(&cb->buf); - hashcpy(cb->nsha1, nsha1); + hashcpy(cb->nsha1, noid->hash); end = strchrnul(target, '\n'); strbuf_add(&cb->buf, target, end - target); if (!strcmp(cb->buf.buf, "HEAD")) { /* HEAD is relative. Resolve it to the right reflog entry. */ strbuf_reset(&cb->buf); - strbuf_add_unique_abbrev(&cb->buf, nsha1, DEFAULT_ABBREV); + strbuf_add_unique_abbrev(&cb->buf, noid->hash, DEFAULT_ABBREV); } return 1; } |