Skip to contentSkip to conversation

Trailing whitespace on git diff output.

DISCUSSION Adria Farres 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

Hello,

Today, while redirecting git diff's output to a text file, I noticed git diff leaves a trailing whitespace between different deltas of the same file (the line that separates two different deltas). For example, committing a file with the following content:
---
test

test
---

then changing it to the following:
---
test
test

test
test
---

committing and diffing it, leaves a trailing whitespace on line 8 of the diff output.

Is that expected behavior? I'm using git 2.1.0.

Sorry for taking your time,

Adria

#1 lore raw
Quoted 17 lines · Adria Farres

Hello,

Today, while redirecting git diff's output to a text file, I noticed git diff leaves a trailing whitespace between different deltas of the same file (the line that separates two different deltas). For example, committing a file with the following content:
---
test

test
---

then changing it to the following:
---
test
test

Quoted 6 lines

test
test
---

committing and diffing it, leaves a trailing whitespace on line 8 of the diff output.

That is (I replaced spaces with _):

test.txt +0 -0
@@ -1,3 +1,5 @@

_test
+test
_
_test
+test

GNU diff does the same, and that is what I would expect: the first column is left for + and -, and spaces are used as a prefix for the context.

If you diff

test
x
test

and

test
test
x
test
test

you'd expect a space before the 'x' in the diff output. In your example, there's a space before the empty string, which has the same role as the 'x' above.

Signature · 2 lines
Matthieu Moy
http://www-verimag.imag.fr/~moy/