path: root/strbuf.c
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.c
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.c')
1 files changed, 0 insertions, 16 deletions
diff --git a/strbuf.c b/strbuf.c
index 83d0502..43a840c 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -1,6 +1,5 @@
#include "cache.h"
#include "refs.h"
-#include "string-list.h"
#include "utf8.h"
int starts_with(const char *str, const char *prefix)
@@ -172,21 +171,6 @@ struct strbuf **strbuf_split_buf(const char *str, size_t slen,
return ret;
-void strbuf_add_separated_string_list(struct strbuf *str,
- const char *sep,
- struct string_list *slist)
- struct string_list_item *item;
- int sep_needed = 0;
- for_each_string_list_item(item, slist) {
- if (sep_needed)
- strbuf_addstr(str, sep);
- strbuf_addstr(str, item->string);
- sep_needed = 1;
- }
void strbuf_list_free(struct strbuf **sbs)
struct strbuf **s = sbs;