Merge branch 'dk/send-email-avoid-net-smtp-ssl-when-able'

diff --git a/refs/ref-cache.h b/refs/ref-cache.h
index ffdc54f3f07961b1ddd6b56c64973e40c18583bd..1f65e2f9ed2c8dc742ba25f53c0be18b0c50581e 100644 (file)
--- a/refs/ref-cache.h
+++ b/refs/ref-cache.h
@@ -185,7 +185,7 @@ struct ref_entry *create_dir_entry(struct ref_cache *cache,
                                   int incomplete);
 
 struct ref_entry *create_ref_entry(const char *refname,
-                                  const unsigned char *sha1, int flag,
+                                  const struct object_id *oid, int flag,
                                   int check_name);
 
 /*