Merge branch 'vr/git-merge-default-to-upstream'

diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl
index e9db0c49895fbebdf8dbe7c0472546a05fea26a0..e38b647b71ea335d6771121cfd079de919ced55b 100644 (file)
--- 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} {
@@ -350,12 +356,21 @@ proc do_add_all {} {
        global file_states
 
        set paths [list]
+       set unknown_paths [list]
        foreach path [array names file_states] {
                switch -glob -- [lindex $file_states($path) 0] {
                U? {continue}
                ?M -
                ?T -
                ?D {lappend paths $path}
+               ?O {lappend unknown_paths $path}
+               }
+       }
+       if {[llength $unknown_paths]} {
+               set reply [ask_popup [mc "There are unknown files do you also want
+to stage those?"]]
+               if {$reply} {
+                       set paths [concat $paths $unknown_paths]
                }
        }
        add_helper {Adding all changed files} $paths