diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-14 13:04:55 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-14 13:04:55 (GMT) |
| commit | 66798b2c0139ffe530f62d2f3519859a451c6eaa (patch) | |
| tree | be45779b17abc717c80bcc7f86f5314fa46b6db6 | |
| parent | d0cfe30a0d61b7b9fe957c29c73ea5aa1d9f8310 (diff) | |
| parent | 52f93c85fd4b12afc887e78f895f6dd7e33983db (diff) | |
| download | tcl-66798b2c0139ffe530f62d2f3519859a451c6eaa.zip tcl-66798b2c0139ffe530f62d2f3519859a451c6eaa.tar.gz tcl-66798b2c0139ffe530f62d2f3519859a451c6eaa.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | .fossil-settings/binary-glob | 17 | ||||
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | tests/winFCmd.test | 2 |
3 files changed, 2 insertions, 18 deletions
diff --git a/.fossil-settings/binary-glob b/.fossil-settings/binary-glob index a6eec26..7e8f357 100644 --- a/.fossil-settings/binary-glob +++ b/.fossil-settings/binary-glob @@ -1,20 +1,3 @@ -compat/zlib/win32/zdll.lib -compat/zlib/win32/zlib1.dll -compat/zlib/win64/zdll.lib -compat/zlib/win64/zlib1.dll -compat/zlib/win64/libz.dll.a -compat/zlib/zlib.3.pdf -compat/zlib/win32/zdll.lib -compat/zlib/win32/zlib1.dll -compat/zlib/win64/zdll.lib -compat/zlib/win64/zlib1.dll -compat/zlib/win64/libz.dll.a -compat/zlib/zlib.3.pdf -libtommath/win32/tommath.lib -libtommath/win32/libtommath.dll -libtommath/win64/tommath.lib -libtommath/win64/libtommath.dll -libtommath/win64/libtommath.dll.a *.a *.bmp *.dll diff --git a/.gitattributes b/.gitattributes index e9a67c8..8a49592 100644 --- a/.gitattributes +++ b/.gitattributes @@ -27,6 +27,7 @@ # Denote all files that are truly binary and should not be modified. *.a binary +*.bmp binary *.dll binary *.exe binary *.gif binary diff --git a/tests/winFCmd.test b/tests/winFCmd.test index f46dc5b..ef62cec 100644 --- a/tests/winFCmd.test +++ b/tests/winFCmd.test @@ -384,7 +384,7 @@ proc MakeFiles {dirname} { set f [open $filename w] close $f file stat $filename stat - if {[set n [lsearch -exact -integer $inodes $stat(ino)]] != -1} { + if {[set n [lsearch -exact -integer $inodes $stat(ino)]] >= 0} { return [list [file join $dirname Test$n] $filename] } lappend inodes $stat(ino) |