diff options
author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2022-10-17 16:17:40 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-10-17 21:53:00 +0300 |
commit | b8dbfd030ccc8e5be6b22bc28a342119504e0c2b (patch) | |
tree | a7caa68dcf31b2bdef967c896fdfa10eebdb6334 /commit.c | |
parent | 05ec41855da2ba813e6cfb5fb1fb86aea623addc (diff) |
rebase: be stricter when reading state files containing oids
The state files for 'onto' and 'orig_head' should contain a full hex
oid, change the reading functions from get_oid() to get_oid_hex() to
reflect this. They should also name commits and not tags so add and use
a function that looks up a commit from an oid like
lookup_commit_reference() but without dereferencing tags.
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
-rw-r--r-- | commit.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -59,6 +59,14 @@ struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref return c; } +struct commit *lookup_commit_object(struct repository *r, + const struct object_id *oid) +{ + struct object *obj = parse_object(r, oid); + return obj ? object_as_type(obj, OBJ_COMMIT, 0) : NULL; + +} + struct commit *lookup_commit(struct repository *r, const struct object_id *oid) { struct object *obj = lookup_object(r, oid); |