summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2008-11-26 14:27:10 +0100
committerJunio C Hamano <gitster@pobox.com>2008-11-26 10:47:41 -0800
commitc095a1db3095f26092ee2d2a9c606b8b656936af (patch)
tree44efbadc20ccbc13af3f7562756a7fb5b3e31e79 /xdiff-interface.c
parent26d6cc555db0144961bcb3537312cc5a7b6d84d1 (diff)
downloadgit-c095a1db3095f26092ee2d2a9c606b8b656936af.tar.gz
xdiff-interface.c: remove 10 duplicated lines
Remove an accidentally duplicated sequence of 10 lines. This happens to plug a leak, too. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.c')
-rw-r--r--xdiff-interface.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c
index e8ef46d10d..d782f06d99 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -254,16 +254,6 @@ static long ff_regexp(const char *line, long len,
line_buffer = xstrndup(line, len); /* make NUL terminated */
- /* Exclude terminating newline (and cr) from matching */
- if (len > 0 && line[len-1] == '\n') {
- if (len > 1 && line[len-2] == '\r')
- len -= 2;
- else
- len--;
- }
-
- line_buffer = xstrndup(line, len); /* make NUL terminated */
-
for (i = 0; i < regs->nr; i++) {
struct ff_reg *reg = regs->array + i;
if (!regexec(&reg->re, line_buffer, 2, pmatch, 0)) {
@@ -338,4 +328,3 @@ int git_xmerge_config(const char *var, const char *value, void *cb)
}
return git_default_config(var, value, cb);
}
-