kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'sr/blame-incomplete' into maint 

* sr/blame-incomplete:
  blame: make sure that the last line ends in an LF
maint
Junio C Hamano 2009-11-15 23:07:07 -08:00
parent 6dbdba00ea a5ca8367c2
commit 061c4d0829
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-blame.c
View File

@ -1604,6 +1604,9 @@ static void emit_porcelain(struct scoreboard *sb, struct blame_entry *ent)
} while (ch != '\n' && } while (ch != '\n' &&
cp < sb->final_buf + sb->final_buf_size); cp < sb->final_buf + sb->final_buf_size);
} }

if (sb->final_buf_size && cp[-1] != '\n')
putchar('\n');
} }


static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt) static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt)
@ -1667,6 +1670,9 @@ static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt)
} while (ch != '\n' && } while (ch != '\n' &&
cp < sb->final_buf + sb->final_buf_size); cp < sb->final_buf + sb->final_buf_size);
} }

if (sb->final_buf_size && cp[-1] != '\n')
putchar('\n');
} }


static void output(struct scoreboard *sb, int option) static void output(struct scoreboard *sb, int option)