diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:23:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:23:54 -0700 |
| commit | 1c88a6d17492b197b9b3298cbc34efa804928302 (patch) | |
| tree | b0370caa6322930a13898673c5a559aef20c8791 /diff.c | |
| parent | Merge branch 'js/use-sc-open-max' into maint (diff) | |
| parent | Git 1.7.11.6 (diff) | |
| download | tgif-1c88a6d17492b197b9b3298cbc34efa804928302.tar.xz | |
Sync with 1.7.11.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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) |