git-gui: Auto-update any A? or M? files during rescan.
authorShawn O. Pearce <spearce@spearce.org>
Mon, 27 Nov 2006 00:46:45 +0000 (19:46 -0500)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 27 Nov 2006 05:48:49 +0000 (00:48 -0500)
If the user has partial includes disabled then it doesn't matter what
state the working directory is in; if the file has been included in
the next commit its index state is A or M and we should immediately
run update-index on the working directory file to bring the index in
sync with the working directory.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-gui

diff --git a/git-gui b/git-gui
index 0b0f1e3e7030fb7459af7da18ef827d3d04d58a2..899fa35a6062c7423e615a5c111ab3c2efad150c 100755 (executable)
--- a/git-gui
+++ b/git-gui
@@ -499,8 +499,8 @@ proc rescan_done {fd buf after} {
                set pathList [list]
                foreach path [array names file_states] {
                        switch -- [lindex $file_states($path) 0] {
-                       AM -
-                       MM {lappend pathList $path}
+                       A? -
+                       M? {lappend pathList $path}
                        }
                }
                if {$pathList ne {}} {