Merge branch 'maint'
* maint: git-gui: Fix diff parsing for lines starting with "--" or "++"
This commit is contained in:
commit
95b6a2db25
@ -276,6 +276,7 @@ proc start_show_diff {scroll_pos {add_opts {}}} {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
set ::current_diff_inheader 1
|
||||||
fconfigure $fd \
|
fconfigure $fd \
|
||||||
-blocking 0 \
|
-blocking 0 \
|
||||||
-encoding binary \
|
-encoding binary \
|
||||||
@ -292,6 +293,7 @@ proc read_diff {fd scroll_pos} {
|
|||||||
while {[gets $fd line] >= 0} {
|
while {[gets $fd line] >= 0} {
|
||||||
# -- Cleanup uninteresting diff header lines.
|
# -- Cleanup uninteresting diff header lines.
|
||||||
#
|
#
|
||||||
|
if {$::current_diff_inheader} {
|
||||||
if { [string match {diff --git *} $line]
|
if { [string match {diff --git *} $line]
|
||||||
|| [string match {diff --cc *} $line]
|
|| [string match {diff --cc *} $line]
|
||||||
|| [string match {diff --combined *} $line]
|
|| [string match {diff --combined *} $line]
|
||||||
@ -300,10 +302,12 @@ proc read_diff {fd scroll_pos} {
|
|||||||
append current_diff_header $line "\n"
|
append current_diff_header $line "\n"
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if {[string match {index *} $line]} continue
|
if {[string match {index *} $line]} continue
|
||||||
if {$line eq {deleted file mode 120000}} {
|
if {$line eq {deleted file mode 120000}} {
|
||||||
set line "deleted symlink"
|
set line "deleted symlink"
|
||||||
}
|
}
|
||||||
|
set ::current_diff_inheader 0
|
||||||
|
|
||||||
# -- Automatically detect if this is a 3 way diff.
|
# -- Automatically detect if this is a 3 way diff.
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user