diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-03 14:47:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-12 11:36:59 -0700 |
| commit | cdfcb7f8968f2dc12782dd27089fa3843c45c630 (patch) | |
| tree | 2c009bbb53f8b8d92d6ef2ef94ec655713060985 | |
| parent | 98150241998d880634f190bd41d243a0d963b7b7 (diff) | |
| download | subsurface-cdfcb7f8968f2dc12782dd27089fa3843c45c630.tar.gz | |
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 <torvalds@linux-foundation.org>
| -rw-r--r-- | core/load-git.c | 4 |
1 files changed, 0 insertions, 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); } |