diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2017-10-15 22:06:56 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-10-16 11:05:50 +0900 |
| commit | 34c290a6fc8b1f6705d2646d726df2260927da0f (patch) | |
| tree | 669c6569783ec61850be600dcd1b8496cabbf66d /sequencer.c | |
| parent | refs: convert resolve_refdup and refs_resolve_refdup to struct object_id (diff) | |
| download | tgif-34c290a6fc8b1f6705d2646d726df2260927da0f.tar.xz | |
refs: convert read_ref and read_ref_full to object_id
All but two of the call sites already have parameters using the hash
parameter of struct object_id, so convert them to take a pointer to the
struct directly. Also convert refs_read_refs_full, the underlying
implementation.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index d26985a6ed..3031e7364d 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1630,7 +1630,7 @@ static int rollback_single_pick(void) if (!file_exists(git_path_cherry_pick_head()) && !file_exists(git_path_revert_head())) return error(_("no cherry-pick or revert in progress")); - if (read_ref_full("HEAD", 0, head_oid.hash, NULL)) + if (read_ref_full("HEAD", 0, &head_oid, NULL)) return error(_("cannot resolve HEAD")); if (is_null_oid(&head_oid)) return error(_("cannot abort from a branch yet to be born")); |