path: root/strbuf.h
diff options
authorJunio C Hamano <>2018-04-11 09:07:11 (GMT)
committerJunio C Hamano <>2018-04-11 09:07:11 (GMT)
commit8b026edac3104ecc40a68fd58b764fb3c717babb (patch)
treed42982dc7593d566b4ba43b06f23f86014124d40 /strbuf.h
parent26e47e261e969491ad4e3b6c298450c061749c9e (diff)
Revert "Merge branch 'en/rename-directory-detection'"
This reverts commit e4bb62fa1eeee689744b413e29a50b4d1dae6886, reversing changes made to 468165c1d8a442994a825f3684528361727cd8c0. The topic appears to inflict severe regression in renaming merges, even though the promise of it was that it would improve them. We do not yet know which exact change in the topic was wrong, but in the meantime, let's play it safe and revert it out of 'master' before real Git-using projects are harmed. Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'strbuf.h')
1 files changed, 0 insertions, 16 deletions
diff --git a/strbuf.h b/strbuf.h
index c4de5e4..4efa80c 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -1,8 +1,6 @@
#ifndef STRBUF_H
#define STRBUF_H
-struct string_list;
* strbuf's are meant to be used with all the usual C string and memory
* APIs. Given that the length of the buffer is known, it's often better to
@@ -539,20 +537,6 @@ static inline struct strbuf **strbuf_split(const struct strbuf *sb,
return strbuf_split_max(sb, terminator, 0);
- * Adds all strings of a string list to the strbuf, separated by the given
- * separator. For example, if sep is
- * ', '
- * and slist contains
- * ['element1', 'element2', ..., 'elementN'],
- * then write:
- * 'element1, element2, ..., elementN'
- * to str. If only one element, just write "element1" to str.
- */
-extern void strbuf_add_separated_string_list(struct strbuf *str,
- const char *sep,
- struct string_list *slist);
* Free a NULL-terminated list of strbufs (for example, the return
* values of the strbuf_split*() functions).