@matheusbsbs / matheus-bagliano / commits / b4b2b8454b
Fork 0

git-gui: Correct DD file state to be only D_.

Apparently my earlier suspicion that the file state DD was a bug was correct. A file which has been deleted from the working directory and from the index will always get the state of D_ during a rescan. Thus the only valid state for this to have is D_. We should always use only D_ internally during our state changes. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Shawn O. Pearce committed Jan 20, 2007 at 22:57 UTC b4b2b8454bca8f0636260358e3a63b9097351fc1
1 file changed +3 -4
git-gui.sh
+3 -4
@@ -1104,7 +1104,7 @@ proc commit_committree {fd_wt curHEAD msg} {
1104 __ -
1105 A_ -
1106 M_ -
1107 - DD {
1107 + D_ {
1108 unset file_states($path)
1109 catch {unset selected_paths($path)}
1110 }
@@ -1516,7 +1516,7 @@ proc write_update_index {fd pathList totalCnt batch msg after} {
1516 AD -
1517 MD -
1518 UD -
1519 - _D {set new DD}
1519 + _D {set new D_}
1520
1521 _M -
1522 MM -
@@ -1969,7 +1969,6 @@ foreach i {
1969 {AD "Added (but gone)"}
1970
1971 {_D "Missing"}
1972 - {DD "Removed by commit"}
1972 {D_ "Removed by commit"}
1973 {DO "Removed (still exists)"}
1974 {DM "Removed (but modified)"}
@@ -2872,7 +2871,7 @@ proc toggle_or_diff {w x y} {
2871 switch -glob -- [lindex $file_states($path) 0] {
2872 A_ -
2873 M_ -
2875 - DD -
2874 + D_ -
2875 DO -
2876 DM {
2877 update_indexinfo \