From: Shawn O. Pearce <spearce@spearce.org>
Date: Fri, 5 Sep 2008 04:46:56 +0000 (-0700)
Subject: git-gui: Fix diff parsing for lines starting with "--" or "++"
X-Git-Tag: v1.6.0.2~16^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ca53c3fdcf69f620331f3822cef36d95b5cf5640?hp=ca53c3fdcf69f620331f3822cef36d95b5cf5640

git-gui: Fix diff parsing for lines starting with "--" or "++"

Languages like Lua and SQL use "--" to mark a line as commented out.
If this appears at column 0 and is part of the pre-image we may see
"--- foo" in the diff, indicating that the line whose content is
"-- foo" has been removed from the new version.

git-gui was incorrectly parsing "--- foo" as the old file name
in the file header, causing it to generate a bad patch file when
the user tried to stage or unstage a hunk or the selected line.
We need to keep track of where we are in the parsing so that we do
not misread a deletion or addition record as part of the header.

Reported-by: Alexander Gladysh <agladysh@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---