undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emit_line(): don't emit an empty <SET><RESET> followed by a newline

Browse Source 
When emit_line() is called with an empty line (but non-zero length, as we
send line terminating LF or CRLF to the function), it used to emit
<SET><RESET> followed by a newline.  Stop the wastefulness.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2009-11-27 22:04:10 -08:00
parent c8e1c3d3e8
commit 06a4755270
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
diff.c
View File

@ -295,12 +295,13 @@ static void emit_line_0(FILE *file, const char *set, const char *reset,
nofirst = 0; nofirst = 0;
} }
fputs(set, file); if (len || !nofirst) {
fputs(set, file);
if (!nofirst) if (!nofirst)
fputc(first, file); fputc(first, file);
fwrite(line, len, 1, file); fwrite(line, len, 1, file);
fputs(reset, file); fputs(reset, file);
}
if (has_trailing_carriage_return) if (has_trailing_carriage_return)
fputc('\r', file); fputc('\r', file);
if (has_trailing_newline) if (has_trailing_newline)

8
t/t4034-diff-words.sh
View File

@ -49,7 +49,7 @@ cat > expect <<\EOF
<WHITE>+++ b/post<RESET> <WHITE>+++ b/post<RESET>
<BROWN>@@ -1,3 +1,7 @@<RESET> <BROWN>@@ -1,3 +1,7 @@<RESET>
<RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET> <RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET>
<RESET>
a = b + c<RESET> a = b + c<RESET>
<GREEN>aa = a<RESET> <GREEN>aa = a<RESET>
@ -90,7 +90,7 @@ cat > expect <<\EOF
<WHITE>+++ b/post<RESET> <WHITE>+++ b/post<RESET>
<BROWN>@@ -1,3 +1,7 @@<RESET> <BROWN>@@ -1,3 +1,7 @@<RESET>
h(4),<GREEN>hh<RESET>[44] h(4),<GREEN>hh<RESET>[44]
<RESET>
a = b + c<RESET> a = b + c<RESET>
<GREEN>aa = a<RESET> <GREEN>aa = a<RESET>
@ -126,7 +126,7 @@ cat > expect <<\EOF
<WHITE>+++ b/post<RESET> <WHITE>+++ b/post<RESET>
<BROWN>@@ -1,3 +1,7 @@<RESET> <BROWN>@@ -1,3 +1,7 @@<RESET>
h(4)<GREEN>,hh[44]<RESET> h(4)<GREEN>,hh[44]<RESET>
<RESET>
a = b + c<RESET> a = b + c<RESET>
<GREEN>aa = a<RESET> <GREEN>aa = a<RESET>
@ -168,7 +168,7 @@ cat > expect <<\EOF
<WHITE>+++ b/post<RESET> <WHITE>+++ b/post<RESET>
<BROWN>@@ -1,3 +1,7 @@<RESET> <BROWN>@@ -1,3 +1,7 @@<RESET>
h(4),<GREEN>hh[44<RESET>] h(4),<GREEN>hh[44<RESET>]
<RESET>
a = b + c<RESET> a = b + c<RESET>
<GREEN>aa = a<RESET> <GREEN>aa = a<RESET>