mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-01-23 16:03:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

gitk: Remove closed file descriptors from $blobdifffd

Browse Source 
One shouldn't have descriptors of already closed files around.

The first idea to deal with this (previously) ever growing array
was to remove it entirely, but it's needed to detect start of a
new diff with ths old diff not yet done. This happens when a user
clicks on the same commit in the commit list repeatedly without
delay.

Signed-off-by: Markus Hitter <mah@jump-ing.de>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
This commit is contained in:
Markus Hitter 2016-11-07 16:01:17 +01:00 committed by Paul Mackerras
parent 106a6d9d85
commit 0748f41eb8
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gitk
View File

@ -8073,7 +8073,11 @@ proc getblobdiffline {bdf ids} {
$ctext conf -state normal
while {[incr nr] <= 1000 && [gets $bdf line] >= 0} {
if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
# Older diff read. Abort it.
catch {close $bdf}
if {$ids != $diffids} {
array unset blobdifffd $ids
}
return 0
}
parseblobdiffline $ids $line
@ -8082,6 +8086,7 @@ proc getblobdiffline {bdf ids} {
blobdiffmaybeseehere [eof $bdf]
if {[eof $bdf]} {
catch {close $bdf}
array unset blobdifffd $ids
return 0
}
return [expr {$nr >= 1000? 2: 1}]