diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-10-03 15:42:49 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-10-03 15:42:49 +0900 |
commit | 98c57ea6f00282ed6ab245cf6842972b07c5a6fd (patch) | |
tree | e364f2bbdbb7bd84881173052ee8859784fc04ab /diff.c | |
parent | 5a5b8c1f01d8fec7ca3178d7350e87e8bbcaeec0 (diff) | |
parent | 58aaced4442a6daae1c82318f3f9259001714505 (diff) | |
download | git-98c57ea6f00282ed6ab245cf6842972b07c5a6fd.tar.gz |
Merge branch 'sb/diff-color-move'
The output from "git diff --summary" was broken in a recent topic
that has been merged to 'master' and lost a LF after reporting of
mode change. This has been fixed.
* sb/diff-color-move:
diff: correct newline in summary for renamed files
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -5272,6 +5272,7 @@ static void show_mode_change(struct diff_options *opt, struct diff_filepair *p, strbuf_addch(&sb, ' '); quote_c_style(p->two->path, &sb, NULL, 0); } + strbuf_addch(&sb, '\n'); emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY, sb.buf, sb.len, 0); strbuf_release(&sb); |