undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Shawn O. Pearce 2007-01-20 22:57:19 -05:00
parent 21e409ad7f
commit b4b2b8454b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
git-gui.sh
View File

@ -1104,7 +1104,7 @@ proc commit_committree {fd_wt curHEAD msg} {
__ - __ -
A_ - A_ -
M_ - M_ -
DD { D_ {
unset file_states($path) unset file_states($path)
catch {unset selected_paths($path)} catch {unset selected_paths($path)}
} }
@ -1516,7 +1516,7 @@ proc write_update_index {fd pathList totalCnt batch msg after} {
AD - AD -
MD - MD -
UD - UD -
_D {set new DD} _D {set new D_}
_M - _M -
MM - MM -
@ -1969,7 +1969,6 @@ foreach i {
{AD "Added (but gone)"} {AD "Added (but gone)"}
{_D "Missing"} {_D "Missing"}
{DD "Removed by commit"}
{D_ "Removed by commit"} {D_ "Removed by commit"}
{DO "Removed (still exists)"} {DO "Removed (still exists)"}
{DM "Removed (but modified)"} {DM "Removed (but modified)"}
@ -2872,7 +2871,7 @@ proc toggle_or_diff {w x y} {
switch -glob -- [lindex $file_states($path) 0] { switch -glob -- [lindex $file_states($path) 0] {
A_ - A_ -
M_ - M_ -
DD - D_ -
DO - DO -
DM { DM {
update_indexinfo \ update_indexinfo \