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

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>

diff --git a/diff.c b/diff.c
index 0d7f5ea4a87d2152638f36b30d6366406d33bfa9..108c7d76441398386dd887e9ab608262c31286b4 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -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 (!nofirst)
-               fputc(first, file);
-       fwrite(line, len, 1, file);
-       fputs(reset, file);
+       if (len || !nofirst) {
+               fputs(set, file);
+               if (!nofirst)
+                       fputc(first, file);
+               fwrite(line, len, 1, file);
+               fputs(reset, file);
+       }

        if (has_trailing_carriage_return)
                fputc('\r', file);
        if (has_trailing_newline)
        if (has_trailing_carriage_return)
                fputc('\r', file);
        if (has_trailing_newline)

diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index 21db6e95c4dd7ccf2f25d887fc2c42f3adcd4124..2d24fbeda67772e0dd5e3331d74b0befabff272c 100755 (executable)
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -49,7 +49,7 @@ cat > expect <<\EOF
 <WHITE>+++ b/post<RESET>
 <BROWN>@@ -1,3 +1,7 @@<RESET>
 <RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET>
 <WHITE>+++ b/post<RESET>
 <BROWN>@@ -1,3 +1,7 @@<RESET>
 <RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET>

-<RESET>
+

 a = b + c<RESET>
 
 <GREEN>aa = a<RESET>
 a = b + c<RESET>
 
 <GREEN>aa = a<RESET>


@@ -90,7 +90,7 @@ cat > expect <<\EOF
 <WHITE>+++ b/post<RESET>
 <BROWN>@@ -1,3 +1,7 @@<RESET>
 h(4),<GREEN>hh<RESET>[44]
 <WHITE>+++ b/post<RESET>
 <BROWN>@@ -1,3 +1,7 @@<RESET>
 h(4),<GREEN>hh<RESET>[44]

-<RESET>
+

 a = b + c<RESET>
 
 <GREEN>aa = a<RESET>
 a = b + c<RESET>
 
 <GREEN>aa = a<RESET>


@@ -126,7 +126,7 @@ cat > expect <<\EOF
 <WHITE>+++ b/post<RESET>
 <BROWN>@@ -1,3 +1,7 @@<RESET>
 h(4)<GREEN>,hh[44]<RESET>
 <WHITE>+++ b/post<RESET>
 <BROWN>@@ -1,3 +1,7 @@<RESET>
 h(4)<GREEN>,hh[44]<RESET>

-<RESET>
+

 a = b + c<RESET>
 
 <GREEN>aa = a<RESET>
 a = b + c<RESET>
 
 <GREEN>aa = a<RESET>


@@ -168,7 +168,7 @@ cat > expect <<\EOF
 <WHITE>+++ b/post<RESET>
 <BROWN>@@ -1,3 +1,7 @@<RESET>
 h(4),<GREEN>hh[44<RESET>]
 <WHITE>+++ b/post<RESET>
 <BROWN>@@ -1,3 +1,7 @@<RESET>
 h(4),<GREEN>hh[44<RESET>]

-<RESET>
+

 a = b + c<RESET>
 
 <GREEN>aa = a<RESET>
 a = b + c<RESET>
 
 <GREEN>aa = a<RESET>