Merge branch 'ma/branch-list-paginate'

diff --git a/refs/ref-cache.c b/refs/ref-cache.c
index 043eb83748739d9d3d78586c69005bb866554e7e..82c1cf90a7ef61cc8174bff5a9800af2ec8d7053 100644 (file)
--- 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)
 {