Merge branch 'sr/blame-incomplete' into maint

gitster · gitster · commit 061c4d0829df · 2009-11-15T23:07:07.000-08:00
* sr/blame-incomplete:
  blame: make sure that the last line ends in an LF
diff --git a/builtin-blame.c b/builtin-blame.c
@@ -1604,6 +1604,9 @@ static void emit_porcelain(struct scoreboard *sb, struct blame_entry *ent)
 		} while (ch != '\n' &&
 			 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)
@@ -1667,6 +1670,9 @@ static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt)
 		} while (ch != '\n' &&
 			 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)

Original file line number	Diff line number	Diff line change
`@@ -1604,6 +1604,9 @@ static void emit_porcelain(struct scoreboard sb, struct blame_entry ent)`
`1604`	`1604`	`} while (ch != '\n' &&`
`1605`	`1605`	`cp < sb->final_buf + sb->final_buf_size);`
`1606`	`1606`	`}`
	`1607`	`+`
	`1608`	`+ if (sb->final_buf_size && cp[-1] != '\n')`
	`1609`	`+ putchar('\n');`
`1607`	`1610`	`}`
`1608`	`1611`
`1609`	`1612`	`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)`
`1667`	`1670`	`} while (ch != '\n' &&`
`1668`	`1671`	`cp < sb->final_buf + sb->final_buf_size);`
`1669`	`1672`	`}`
	`1673`	`+`
	`1674`	`+ if (sb->final_buf_size && cp[-1] != '\n')`
	`1675`	`+ putchar('\n');`
`1670`	`1676`	`}`
`1671`	`1677`
`1672`	`1678`	`static void output(struct scoreboard *sb, int option)`