diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/commit.tcl | 2 | ||||
| -rw-r--r-- | lib/index.tcl | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/commit.tcl b/lib/commit.tcl index 40a7103557..f4ab70784c 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -149,6 +149,7 @@ The rescan will be automatically started now. _? {continue} A? - D? - + T_ - M? {set files_ready 1} U? { error_popup [mc "Unmerged files cannot be committed. @@ -428,6 +429,7 @@ A rescan will be automatically started now. __ - A_ - M_ - + T_ - D_ { unset file_states($path) catch {unset selected_paths($path)} diff --git a/lib/index.tcl b/lib/index.tcl index 3c1fce7475..7c27f2af6c 100644 --- a/lib/index.tcl +++ b/lib/index.tcl @@ -99,6 +99,7 @@ proc write_update_indexinfo {fd pathList totalCnt batch after} { switch -glob -- [lindex $s 0] { A? {set new _O} M? {set new _M} + T_ {set new _T} D_ {set new _D} D? {set new _?} ?? {continue} @@ -162,6 +163,7 @@ proc write_update_index {fd pathList totalCnt batch after} { ?D {set new D_} _O - AM {set new A_} + _T {set new T_} U? { if {[file exists $path]} { set new M_ @@ -231,6 +233,7 @@ proc write_checkout_index {fd pathList totalCnt batch after} { switch -glob -- [lindex $file_states($path) 0] { U? {continue} ?M - + ?T - ?D { puts -nonewline $fd "[encoding convertto $path]\0" display_file $path ?_ @@ -252,6 +255,7 @@ proc unstage_helper {txt paths} { switch -glob -- [lindex $file_states($path) 0] { A? - M? - + T_ - D? { lappend pathList $path if {$path eq $current_diff_path} { @@ -296,6 +300,7 @@ proc add_helper {txt paths} { _O - ?M - ?D - + ?T - U? { lappend pathList $path if {$path eq $current_diff_path} { @@ -336,6 +341,7 @@ proc do_add_all {} { switch -glob -- [lindex $file_states($path) 0] { U? {continue} ?M - + ?T - ?D {lappend paths $path} } } @@ -353,6 +359,7 @@ proc revert_helper {txt paths} { switch -glob -- [lindex $file_states($path) 0] { U? {continue} ?M - + ?T - ?D { lappend pathList $path if {$path eq $current_diff_path} { |