aboutsummaryrefslogtreecommitdiffstats
path: root/refs/ref-cache.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2017-11-05 09:42:09 +0100
committerJunio C Hamano <gitster@pobox.com>2017-11-06 10:31:08 +0900
commit78fb457968591887ebb331d3d0475c00c7dbb317 (patch)
tree87d1ac511d33c92e1153e2cd73a046a5578eea25 /refs/ref-cache.c
parent417018826285140f9e948649ff9cf75a193075d2 (diff)
downloadgit-78fb457968591887ebb331d3d0475c00c7dbb317.tar.gz
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/ref-cache.c')
-rw-r--r--refs/ref-cache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/refs/ref-cache.c b/refs/ref-cache.c
index 043eb83748..82c1cf90a7 100644
--- a/refs/ref-cache.c
+++ b/refs/ref-cache.c
@@ -260,8 +260,8 @@ int add_ref_entry(struct ref_dir *dir, struct ref_entry *ref)
/*
* Emit a warning and return true iff ref1 and ref2 have the same name
- * and the same sha1. Die if they have the same name but different
- * sha1s.
+ * and the same oid. Die if they have the same name but different
+ * oids.
*/
static int is_dup_ref(const struct ref_entry *ref1, const struct ref_entry *ref2)
{