git-gui: handle index lines only in the diff header

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
This commit is contained in:
Bert Wesarg 2010-12-09 21:47:53 +01:00 committed by Pat Thoyts
parent c976bbff3c
commit ebd143ff99

View File

@ -402,12 +402,12 @@ proc read_diff {fd conflict_size cont_info} {
|| [string match {diff --cc *} $line]
|| [string match {diff --combined *} $line]
|| [string match {--- *} $line]
|| [string match {+++ *} $line]} {
|| [string match {+++ *} $line]
|| [string match {index *} $line]} {
continue
}
}
if {[string match {index *} $line]} continue
if {$line eq {deleted file mode 120000}} {
set line "deleted symlink"
}