From cdfcb7f8968f2dc12782dd27089fa3843c45c630 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 3 Apr 2020 14:47:09 -0700 Subject: Remove 'string marker after running out of strings' warning This warning is unnecessarily scary - we had a problem with parsing multiple strings on the same line, but it should be all solved, and while it does mean that people may have old incorrect git save files with empty strings, scaring users about it isn't going to help. And with the warning removed, we can just remove the whole test for an empty string, because the normal code sequence handles that case just fine. Signed-off-by: Linus Torvalds --- core/load-git.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/load-git.c b/core/load-git.c index 8d3257d0b..49482b6c6 100644 --- a/core/load-git.c +++ b/core/load-git.c @@ -348,10 +348,6 @@ static char *pop_cstring(struct membuffer *str, const char *err) report_error("git-load: string marker without any strings ('%s')", err); return strdup(""); } - if (!str->len) { - report_error("git-load: string marker after running out of strings ('%s')", err); - return strdup(""); - } len = strlen(mb_cstring(str)) + 1; return remove_from_front(str, len); } -- cgit v1.2.3-70-g09d2