aboutsummaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2006-11-26 19:46:45 -0500
committerShawn O. Pearce <spearce@spearce.org>2006-11-27 00:48:49 -0500
commitc15ad650c77ef3213d723efec4e1dca89efba6cd (patch)
tree5771facb0b33e0fbd5910086dfb98e7bd64a3041 /git-gui
parentf70c3a2caccf4f0f5abfd3d0db4120e8659dd0d7 (diff)
downloadgit-c15ad650c77ef3213d723efec4e1dca89efba6cd.tar.gz
git-c15ad650c77ef3213d723efec4e1dca89efba6cd.tar.xz
git-gui: Auto-update any A? or M? files during rescan.
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>
Diffstat (limited to 'git-gui')
-rwxr-xr-xgit-gui4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-gui b/git-gui
index 0b0f1e3e7..899fa35a6 100755
--- 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 {}} {