mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with 1.7.11.6

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2012-09-11 11:23:45 -07:00
parent 3119084104 e09e4024a0
commit 1c88a6d174
32 changed files with 585 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
diff.c
View File

@ -574,6 +574,7 @@ static void emit_rewrite_lines(struct emit_callback *ecb,
if (!endp) {
const char *plain = diff_get_color(ecb->color_diff,
DIFF_PLAIN);
putc('\n', ecb->opt->file);
emit_line_0(ecb->opt, plain, reset, '\\',
nneof, strlen(nneof));
}
@ -3187,7 +3188,7 @@ void diff_setup(struct diff_options *options)
}
}
int diff_setup_done(struct diff_options *options)
void diff_setup_done(struct diff_options *options)
{
int count = 0;
@ -3286,8 +3287,6 @@ int diff_setup_done(struct diff_options *options)
options->output_format = DIFF_FORMAT_NO_OUTPUT;
DIFF_OPT_SET(options, EXIT_WITH_STATUS);
}
return 0;
}
static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)