diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-26 10:42:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-26 10:42:35 -0700 |
| commit | 42f98745732c68baa6d79a50eab0d726b549025d (patch) | |
| tree | 1faa87249a8800a909bed0d34a22f13207bb3ad5 /git-gui/lib/commit.tcl | |
| parent | Sync with 1.7.4.2 (diff) | |
| parent | Merge branch 'ss/git-gui-mergetool' (diff) | |
| download | tgif-42f98745732c68baa6d79a50eab0d726b549025d.tar.xz | |
Merge git-gui 0.14.0
Diffstat (limited to 'git-gui/lib/commit.tcl')
| -rw-r--r-- | git-gui/lib/commit.tcl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl index 7f459cd564..5ce46877bf 100644 --- 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] \ |