development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 05:14:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-gui: Correct some state matchings for include/remove.

Browse source 
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2006-11-19 03:46:29 -05:00
parent a29481e212
commit 375f38828e
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
git-gui
View file

@ -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] \