Merge branch 'nd/resolve-ref'

[git.git] / cache.h

diff --git a/cache.h b/cache.h
index 627fb6a084b3d3e60b10121928c59edb384b96c4..af203fcab0821d667e58fd30eceb5b0be43bf507 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -867,7 +867,8 @@ extern int read_ref(const char *filename, unsigned char *sha1);
  *
  * errno is sometimes set on errors, but not always.
  */
-extern const char *resolve_ref(const char *ref, unsigned char *sha1, int reading, int *flag);
+extern const char *resolve_ref_unsafe(const char *ref, unsigned char *sha1, int reading, int *flag);
+extern char *resolve_refdup(const char *ref, unsigned char *sha1, int reading, int *flag);
 
 extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
 extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);