Merge branch 'cb/maint-merge-recursive-submodule-fix'

diff --git a/strbuf.h b/strbuf.h
index b1670d99456e96b5de01918e157e10df519cae13..9ee908a3ec5d4d5329385bc10cdd676f703c0c1f 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -124,10 +124,14 @@ extern size_t strbuf_fread(struct strbuf *, size_t, FILE *);
 /* XXX: if read fails, any partial read is undone */
 extern ssize_t strbuf_read(struct strbuf *, int fd, size_t hint);
 extern int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint);
+extern int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint);
 
 extern int strbuf_getline(struct strbuf *, FILE *, int);
 
 extern void stripspace(struct strbuf *buf, int skip_comments);
 extern int launch_editor(const char *path, struct strbuf *buffer, const char *const *env);
 
+extern int strbuf_branchname(struct strbuf *sb, const char *name);
+extern int strbuf_check_branch_ref(struct strbuf *sb, const char *name);
+
 #endif /* STRBUF_H */