git-gui: Fix list loading corruption introduced by 1461c5f3.

Tcl let me assign two different types of values to the variable $n.
Prior to 1461c5f3 $n was the total number of bytes in the string;
but in that commit it also became the current info list for the
current file.  This caused $c < $n to fail as $n was now treated
as 0 and we only loaded the first file in each buffer.

So use a different variable, like $i, instead.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-gui b/git-gui
index 7ea31e50892fc17e2fe7c737f1570799aea7df29..bd22125e5130207871446c73863be23e2ed962f6 100755 (executable)
--- a/git-gui
+++ b/git-gui
@@ -369,13 +369,14 @@ proc read_diff_index {fd after} {
                if {$z2 == -1} break
 
                incr c
                if {$z2 == -1} break
 
                incr c

-               set n [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
+               set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]

                merge_state \
                        [string range $buf_rdi $z1 [expr {$z2 - 1}]] \
                merge_state \
                        [string range $buf_rdi $z1 [expr {$z2 - 1}]] \

-                       [lindex $n 4]? \
-                       [list [lindex $n 0] [lindex $n 2]] \
+                       [lindex $i 4]? \
+                       [list [lindex $i 0] [lindex $i 2]] \

                        [list]
                set c $z2
                        [list]
                set c $z2

+               incr c

        }
        if {$c < $n} {
                set buf_rdi [string range $buf_rdi $c end]
        }
        if {$c < $n} {
                set buf_rdi [string range $buf_rdi $c end]


@@ -400,13 +401,14 @@ proc read_diff_files {fd after} {
                if {$z2 == -1} break
 
                incr c
                if {$z2 == -1} break
 
                incr c

-               set n [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
+               set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]

                merge_state \
                        [string range $buf_rdf $z1 [expr {$z2 - 1}]] \
                merge_state \
                        [string range $buf_rdf $z1 [expr {$z2 - 1}]] \

-                       ?[lindex $n 4] \
+                       ?[lindex $i 4] \

                        [list] \
                        [list] \

-                       [list [lindex $n 0] [lindex $n 2]]
+                       [list [lindex $i 0] [lindex $i 2]]

                set c $z2
                set c $z2

+               incr c

        }
        if {$c < $n} {
                set buf_rdf [string range $buf_rdf $c end]
        }
        if {$c < $n} {
                set buf_rdf [string range $buf_rdf $c end]