Merge branch 'en/merge-recursive'

diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 7f459cd5647f690a5e48ed7c29fc0d75eef89d0c..5ce46877bfb24701187f5ff5e94ce4aaf8b666b2 100644 (file)
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -161,11 +161,12 @@ The rescan will be automatically started now.
        #
        set files_ready 0
        foreach path [array names file_states] {
-               switch -glob -- [lindex $file_states($path) 0] {
+               set s $file_states($path)
+               switch -glob -- [lindex $s 0] {
                _? {continue}
                A? -
                D? -
-               T_ -
+               T? -
                M? {set files_ready 1}
                _U -
                U? {
@@ -452,7 +453,11 @@ A rescan will be automatically started now.
                }
                AM -
                AD -
+               AT -
+               TM -
+               TD -
                MM -
+               MT -
                MD {
                        set file_states($path) [list \
                                _[string index $m 1] \