diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2006-11-19 03:46:29 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2006-11-19 03:46:29 -0500 |
| commit | 375f38828e9c50ad79b6582e768db410216c2c41 (patch) | |
| tree | 61cf3e7cf1622955135711aebb28ec98e357157f /git-gui | |
| parent | a29481e2123c2fd14fbcb2531be9de16adf21779 (diff) | |
| download | git-375f38828e9c50ad79b6582e768db410216c2c41.tar.gz git-375f38828e9c50ad79b6582e768db410216c2c41.tar.xz | |
git-gui: Correct some state matchings for include/remove.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'git-gui')
| -rwxr-xr-x | git-gui | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1676,6 +1676,7 @@ foreach i { {DO i removed "Removed (still exists)"} {DM i removed "Removed (but modified)"} + {UD i merge "Merge conflicts"} {UM i merge "Merge conflicts"} {U_ i merge "Merge conflicts"} } { @@ -2033,12 +2034,11 @@ proc include_helper {txt paths} { set pathList [list] set after {} foreach path $paths { - switch -- [lindex $file_states($path) 0] { + switch -glob -- [lindex $file_states($path) 0] { AM - AD - MM - - UM - - U_ - + U? - _M - _D - _O { @@ -2437,7 +2437,8 @@ proc toggle_or_diff {w x y} { A_ - M_ - DD - - D_ { + DO - + DM { update_indexinfo \ "Removing [short_path $path] from commit" \ [list $path] \ |