diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2006-11-26 19:46:45 -0500 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2006-11-27 00:48:49 -0500 |
commit | c15ad650c77ef3213d723efec4e1dca89efba6cd (patch) | |
tree | 5771facb0b33e0fbd5910086dfb98e7bd64a3041 /git-gui | |
parent | git-gui: Enable resolution of merge conflicts. (diff) | |
download | tgif-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-x | git-gui | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 {}} { |