diff options
author | Michael Haggerty <mhagger@alum.mit.edu> | 2017-11-05 09:42:09 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-06 10:31:08 +0900 |
commit | 78fb457968591887ebb331d3d0475c00c7dbb317 (patch) | |
tree | 87d1ac511d33c92e1153e2cd73a046a5578eea25 /refs/refs-internal.h | |
parent | write_packed_entry(): take `object_id` arguments (diff) | |
download | tgif-78fb457968591887ebb331d3d0475c00c7dbb317.tar.xz |
refs: update some more docs to use "oid" rather than "sha1"
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs/refs-internal.h')
-rw-r--r-- | refs/refs-internal.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/refs/refs-internal.h b/refs/refs-internal.h index f9c6e72c97..dd834314bd 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h @@ -15,13 +15,13 @@ */ /* - * The reference should be updated to new_sha1. + * The reference should be updated to new_oid. */ #define REF_HAVE_NEW (1 << 2) /* * The current reference's value should be checked to make sure that - * it agrees with old_sha1. + * it agrees with old_oid. */ #define REF_HAVE_OLD (1 << 3) @@ -86,7 +86,7 @@ enum peel_status { * tag recursively until a non-tag is found. If successful, store the * result to oid and return PEEL_PEELED. If the object is not a tag * or is not valid, return PEEL_NON_TAG or PEEL_INVALID, respectively, - * and leave sha1 unchanged. + * and leave oid unchanged. */ enum peel_status peel_object(const struct object_id *name, struct object_id *oid); @@ -98,11 +98,11 @@ enum peel_status peel_object(const struct object_id *name, struct object_id *oid int copy_reflog_msg(char *buf, const char *msg); /** - * Information needed for a single ref update. Set new_sha1 to the new - * value or to null_sha1 to delete the ref. To check the old value - * while the ref is locked, set (flags & REF_HAVE_OLD) and set - * old_sha1 to the old value, or to null_sha1 to ensure the ref does - * not exist before update. + * Information needed for a single ref update. Set new_oid to the new + * value or to null_oid to delete the ref. To check the old value + * while the ref is locked, set (flags & REF_HAVE_OLD) and set old_oid + * to the old value, or to null_oid to ensure the ref does not exist + * before update. */ struct ref_update { /* @@ -158,7 +158,7 @@ int ref_update_reject_duplicates(struct string_list *refnames, /* * Add a ref_update with the specified properties to transaction, and * return a pointer to the new object. This function does not verify - * that refname is well-formed. new_sha1 and old_sha1 are only + * that refname is well-formed. new_oid and old_oid are only * dereferenced if the REF_HAVE_NEW and REF_HAVE_OLD bits, * respectively, are set in flags. */ |