diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2006-11-19 05:46:08 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2006-11-19 05:46:08 (GMT) |
| commit | dde5974ef109ed3aadfbac4d233899fb04d1c9ff (patch) | |
| tree | 7639d5785f4592959750718c8f391ca7b2c9248a /git-gui | |
| parent | 74d18d2edfc84d35b20e1b4520e496aadc14c365 (diff) | |
| download | git-dde5974ef109ed3aadfbac4d233899fb04d1c9ff.zip git-dde5974ef109ed3aadfbac4d233899fb04d1c9ff.tar.gz git-dde5974ef109ed3aadfbac4d233899fb04d1c9ff.tar.bz2 | |
git-gui: Correct toggling of deleted file status.
There was a bug with the way we handled deleted file status. A file
really shouldn't be in D_ state when it has been deleted, instead it
is really DD. Therefore we should have toggled _D to DD, not D_,
thereby letting us toggle back to _D.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'git-gui')
| -rwxr-xr-x | git-gui | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1022,6 +1022,8 @@ proc commit_committree {fd_wt curHEAD msg} { set s $file_states($path) set m [lindex $s 0] switch -glob -- $m { + DD - + AO {set m __} A? - M? - D? {set m _[string index $m 1]} @@ -1409,7 +1411,7 @@ proc write_update_index {fd pathList totalCnt batch msg after} { switch -glob -- [lindex $file_states($path) 0] { AD - MD - - _D {set new D_} + _D {set new DD} _M - MM - @@ -2414,6 +2416,7 @@ proc toggle_or_diff {w x y} { A_ - AO - M_ - + DD - D_ { update_indexinfo \ "Removing [short_path $path] from commit" \ |