summaryrefslogtreecommitdiffstats
path: root/lib/index.tcl
diff options
context:
space:
mode:
authorBert Wesarg <bert.wesarg@googlemail.com>2010-12-09 21:46:23 +0100
committerPat Thoyts <patthoyts@users.sourceforge.net>2011-01-28 00:16:50 +0000
commit7587f4d32f7479a9fa9ae1767708597702a0be5f (patch)
tree9750628d932d9799be3709db01d7a1cbe2dafe6e /lib/index.tcl
parentgit-gui: remove 'no such variable' for s error when encounter unknown file st... (diff)
downloadgit-7587f4d32f7479a9fa9ae1767708597702a0be5f.tar.gz
git-7587f4d32f7479a9fa9ae1767708597702a0be5f.zip
git-gui: learn more type change states
Support the following states with type change in git-gui: AT, MT, TD, TM Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Diffstat (limited to '')
-rw-r--r--lib/index.tcl10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/index.tcl b/lib/index.tcl
index e9db0c4989..5d7bbf23ed 100644
--- a/lib/index.tcl
+++ b/lib/index.tcl
@@ -103,8 +103,11 @@ proc write_update_indexinfo {fd pathList totalCnt batch after} {
set s $file_states($path)
switch -glob -- [lindex $s 0] {
A? {set new _O}
- M? {set new _M}
+ MT -
+ TM -
T_ {set new _T}
+ M? {set new _M}
+ TD -
D_ {set new _D}
D? {set new _?}
?? {continue}
@@ -167,7 +170,10 @@ proc write_update_index {fd pathList totalCnt batch after} {
AD {set new __}
?D {set new D_}
_O -
+ AT -
AM {set new A_}
+ TM -
+ MT -
_T {set new T_}
_U -
U? {
@@ -261,7 +267,7 @@ proc unstage_helper {txt paths} {
switch -glob -- [lindex $file_states($path) 0] {
A? -
M? -
- T_ -
+ T? -
D? {
lappend pathList $path
if {$path eq $current_diff_path} {