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/index.tcl | |
| parent | 421446b6fcf2c3767e7e714388163b29a65f45cc (diff) | |
| parent | fbc9629e2f0cd31ab08638ebbd8f98a323329a5b (diff) | |
| download | git-42f98745732c68baa6d79a50eab0d726b549025d.tar.gz git-42f98745732c68baa6d79a50eab0d726b549025d.tar.xz | |
Merge git-gui 0.14.0
Diffstat (limited to 'git-gui/lib/index.tcl')
| -rw-r--r-- | git-gui/lib/index.tcl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl index e9db0c498..5d7bbf23e 100644 --- a/git-gui/lib/index.tcl +++ b/git-gui/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} { |