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>
Bert Wesarg committed
Dec 9, 2010 at 21:47 UTC
ebd143ff999f40996832e9c221c41cb609578cd1
1 file changed
+2
-2
lib/diff.tcl
+2
-2
@@ -402,12 +402,12 @@ proc read_diff {fd conflict_size cont_info} {
402
|| [string match {diff --cc *} $line]
403
|| [string match {diff --combined *} $line]
404
|| [string match {--- *} $line]
405
- || [string match {+++ *} $line]} {
405
+ || [string match {+++ *} $line]
406
+ || [string match {index *} $line]} {
407
continue
408
}
409
}
410
410
- if {[string match {index *} $line]} continue
411
if {$line eq {deleted file mode 120000}} {
412
set line "deleted symlink"
413
}