{"thread":{"id":"16477","subject":"[PATCH] xdiff-interface.c: remove 10 duplicated lines","startedAt":"2008-11-26T13:27:10Z","lastAt":"2008-11-26T13:27:10Z","messageCount":1,"participants":["Jim Meyering"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"96544","messageId":"87vduazkgh.fsf@rho.meyering.net","threadId":"16477","inReplyTo":null,"subject":"[PATCH] xdiff-interface.c: remove 10 duplicated lines","fromName":"Jim Meyering","fromEmail":"jim@meyering.net","sentAt":"2008-11-26T13:27:10Z","receivedAt":"2008-11-26T13:27:10Z","isPatch":true,"sender":{"key":"jim@meyering.net","avatar":"https://avatars.githubusercontent.com/u/710630?v=4"},"body":"\nRemove an accidentally duplicated sequence of 10 lines.\nThis happens to plug a leak, too.\n\n---\nThis is relative to the tip of \"next\".\n\n xdiff-interface.c |   11 -----------\n 1 files changed, 0 insertions(+), 11 deletions(-)\n\ndiff --git a/xdiff-interface.c b/xdiff-interface.c\nindex e8ef46d..d782f06 100644\n--- a/xdiff-interface.c\n+++ b/xdiff-interface.c\n@@ -247,30 +247,20 @@ static long ff_regexp(const char *line, long len,\n \t/* Exclude terminating newline (and cr) from matching */\n \tif (len > 0 && line[len-1] == '\\n') {\n \t\tif (len > 1 && line[len-2] == '\\r')\n \t\t\tlen -= 2;\n \t\telse\n \t\t\tlen--;\n \t}\n\n \tline_buffer = xstrndup(line, len); /* make NUL terminated */\n\n-\t/* Exclude terminating newline (and cr) from matching */\n-\tif (len > 0 && line[len-1] == '\\n') {\n-\t\tif (len > 1 && line[len-2] == '\\r')\n-\t\t\tlen -= 2;\n-\t\telse\n-\t\t\tlen--;\n-\t}\n-\n-\tline_buffer = xstrndup(line, len); /* make NUL terminated */\n-\n \tfor (i = 0; i < regs->nr; i++) {\n \t\tstruct ff_reg *reg = regs->array + i;\n \t\tif (!regexec(&reg->re, line_buffer, 2, pmatch, 0)) {\n \t\t\tif (reg->negate)\n \t\t\t\tgoto fail;\n \t\t\tbreak;\n \t\t}\n \t}\n \tif (regs->nr <= i)\n \t\tgoto fail;\n@@ -331,11 +321,10 @@ int git_xmerge_config(const char *var, const char *value, void *cb)\n \t\t\tgit_xmerge_style = XDL_MERGE_DIFF3;\n \t\telse if (!strcmp(value, \"merge\"))\n \t\t\tgit_xmerge_style = 0;\n \t\telse\n \t\t\tdie(\"unknown style '%s' given for '%s'\",\n \t\t\t    value, var);\n \t\treturn 0;\n \t}\n \treturn git_default_config(var, value, cb);\n }\n-\n--\n1.6.0.4.1044.g77718\n"}]}