summaryrefslogtreecommitdiff
path: root/strbuf.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-03-04 22:16:30 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-03-04 22:16:30 -0800
commit26f1e9bd68b6eb32d1376ae392354551c5ae17bc (patch)
tree95022cd5fef1afa3c575f1961156d18d6d090cd1 /strbuf.h
parenthttp.proxy: also mention https_proxy and all_proxy (diff)
parentt5704: match tests to modern style (diff)
downloadtgif-26f1e9bd68b6eb32d1376ae392354551c5ae17bc.tar.xz
Merge branch 'tr/maint-bundle-long-subject' into maint
* tr/maint-bundle-long-subject: t5704: match tests to modern style strbuf: improve strbuf_get*line documentation bundle: use a strbuf to scan the log for boundary commits bundle: put strbuf_readline_fd in strbuf.c with adjustments
Diffstat (limited to 'strbuf.h')
-rw-r--r--strbuf.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/strbuf.h b/strbuf.h
index fbf059f4d3..3effaa86b6 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -116,6 +116,7 @@ extern int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint);
extern int strbuf_getwholeline(struct strbuf *, FILE *, int);
extern int strbuf_getline(struct strbuf *, FILE *, int);
+extern int strbuf_getwholeline_fd(struct strbuf *, int, int);
extern void stripspace(struct strbuf *buf, int skip_comments);
extern int launch_editor(const char *path, struct strbuf *buffer, const char *const *env);