aboutsummaryrefslogtreecommitdiff
path: root/strbuf.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-09 13:36:20 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-09 13:36:20 -0700
commit8502a779dad784785d9f3d5c880ce08b9ad0f483 (patch)
tree975d1e72deb75cc91fd75653f50f9fde7db0a7cd /strbuf.h
parentdbdc07fcbe3a951df8a3869b42edb6fffd466486 (diff)
parent8a557bb77fc009b00f7952f0d3d6ebd33079f70e (diff)
downloadgit-8502a779dad784785d9f3d5c880ce08b9ad0f483.tar.gz
git-8502a779dad784785d9f3d5c880ce08b9ad0f483.tar.xz
Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8
* 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 46a33f8c4..e42dbe5ac 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -108,6 +108,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);