git-gui: Correct some state matchings for include/remove.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce committed
Nov 19, 2006 at 03:46 UTC
375f38828e9c50ad79b6582e768db410216c2c41
1 file changed
+5
-4
git-gui
+5
-4
@@ -1676,6 +1676,7 @@ foreach i {
1676
{DO i removed "Removed (still exists)"}
1677
{DM i removed "Removed (but modified)"}
1678
1679
+ {UD i merge "Merge conflicts"}
1680
{UM i merge "Merge conflicts"}
1681
{U_ i merge "Merge conflicts"}
1682
} {
@@ -2033,12 +2034,11 @@ proc include_helper {txt paths} {
2034
set pathList [list]
2035
set after {}
2036
foreach path $paths {
2036
- switch -- [lindex $file_states($path) 0] {
2037
+ switch -glob -- [lindex $file_states($path) 0] {
2038
AM -
2039
AD -
2040
MM -
2040
- UM -
2041
- U_ -
2041
+ U? -
2042
_M -
2043
_D -
2044
_O {
@@ -2437,7 +2437,8 @@ proc toggle_or_diff {w x y} {
2437
A_ -
2438
M_ -
2439
DD -
2440
- D_ {
2440
+ DO -
2441
+ DM {
2442
update_indexinfo \
2443
"Removing [short_path $path] from commit" \
2444
[list $path] \