Merge branch 'pg/diff-stat-unmerged-regression-fix'
The output from "git diff --stat" on an unmerged path lost the terminating LF in Git 2.39, which has been corrected. * pg/diff-stat-unmerged-regression-fix: diff: fix regression with --stat and unmerged file
This commit is contained in:
2
diff.c
2
diff.c
@ -2800,7 +2800,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
|
||||
else if (file->is_unmerged) {
|
||||
strbuf_addf(&out, " %s%s%*s | %*s",
|
||||
prefix, name, padding, "",
|
||||
number_width, "Unmerged");
|
||||
number_width, "Unmerged\n");
|
||||
emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
|
||||
out.buf, out.len, 0);
|
||||
strbuf_reset(&out);
|
||||
|
Reference in New Issue
Block a user