summaryrefslogtreecommitdiff
path: root/git-gui/lib/commit.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-26 17:42:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-26 17:42:35 (GMT)
commit42f98745732c68baa6d79a50eab0d726b549025d (patch)
tree1faa87249a8800a909bed0d34a22f13207bb3ad5 /git-gui/lib/commit.tcl
parent421446b6fcf2c3767e7e714388163b29a65f45cc (diff)
parentfbc9629e2f0cd31ab08638ebbd8f98a323329a5b (diff)
downloadgit-42f98745732c68baa6d79a50eab0d726b549025d.zip
git-42f98745732c68baa6d79a50eab0d726b549025d.tar.gz
git-42f98745732c68baa6d79a50eab0d726b549025d.tar.bz2
Merge git-gui 0.14.0
Diffstat (limited to 'git-gui/lib/commit.tcl')
-rw-r--r--git-gui/lib/commit.tcl9
1 files changed, 7 insertions, 2 deletions
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 7f459cd..5ce4687 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] \