kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
maint
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)"} {DO i removed "Removed (still exists)"}
{DM i removed "Removed (but modified)"} {DM i removed "Removed (but modified)"}


{UD i merge "Merge conflicts"}
{UM i merge "Merge conflicts"} {UM i merge "Merge conflicts"}
{U_ i merge "Merge conflicts"} {U_ i merge "Merge conflicts"}
} { } {
@ -2033,12 +2034,11 @@ proc include_helper {txt paths} {
set pathList [list] set pathList [list]
set after {} set after {}
foreach path $paths { foreach path $paths {
switch -- [lindex $file_states($path) 0] { switch -glob -- [lindex $file_states($path) 0] {
AM - AM -
AD - AD -
MM - MM -
UM - U? -
U_ -
_M - _M -
_D - _D -
_O { _O {
@ -2437,7 +2437,8 @@ proc toggle_or_diff {w x y} {
A_ - A_ -
M_ - M_ -
DD - DD -
D_ { DO -
DM {
update_indexinfo \ update_indexinfo \
"Removing [short_path $path] from commit" \ "Removing [short_path $path] from commit" \
[list $path] \ [list $path] \