* Possible bug with --word-diff=porcelain
@ 2011-05-01 20:00 Eli Barzilay
0 siblings, 0 replies; only message in thread
From: Eli Barzilay @ 2011-05-01 20:00 UTC (permalink / raw)
To: git
It looks like there are cases where a newline is omitted in the output
of --word-diff=porcelain:
$ cat A
A foo B
zzzzzzzz
C
$ cat B
A bar B
C
$ git diff --word-diff=porcelain A B
diff --git a/A b/B
index dfadf3e..3e2f1ba 100644
--- a/A
+++ b/B
@@ -1,3 +1,2 @@
A
-foo
+bar
B /// right
-zzzzzzzz \\\ here
~
C
~
I'd expect the output to be
--- a/A
+++ b/B
@@ -1,3 +1,2 @@
A
-foo
+bar
B
~
-zzzzzzzz
~
C
~
Actually it looks like the problem is not just in the porcelain
output: I see it with other formats too, like the plain one:
diff --git a/A b/B
index dfadf3e..3e2f1ba 100644
--- a/A
+++ b/B
@@ -1,3 +1,2 @@
A [-foo-]{+bar+} B[-zzzzzzzz-]
C
and with --word-diff=color:
diff --git a/A b/B
index dfadf3e..3e2f1ba 100644
--- a/A
+++ b/B
@@ -1,3 +1,2 @@
A foobar Bzzzzzzzz
C
(where the colors are correct, but the newline is missing)
--
((lambda (x) (x x)) (lambda (x) (x x))) Eli Barzilay:
http://barzilay.org/ Maze is Life!
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-05-01 20:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-01 20:00 Possible bug with --word-diff=porcelain Eli Barzilay
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).