From de5f6d5d178a1c8113aaca34c8f6b3842732a741 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sat, 20 Jan 2007 23:10:30 -0500 Subject: [PATCH] git-gui: Add or unstage based on the specific icon used. Rather than relying on the file state and just inverting it, we should look at which file icon the user clicked on. If they clicked on the one in the "Changes To Be Committed" list then they want to unstage the file. If they clicked on the icon in the "Changed But Not Updated" list then they want to add the file to the commit. This should be much more reliable about capturing the user's intent then looking at the file state. Signed-off-by: Shawn O. Pearce --- git-gui.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/git-gui.sh b/git-gui.sh index 84ec57366..c1ee48bf0 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -2867,23 +2867,17 @@ proc toggle_or_diff {w x y} { } else { set after {} } - switch -glob -- [lindex $file_states($path) 0] { - A_ - - M_ - - D_ - - DO { + if {$w eq $ui_index} { update_indexinfo \ "Unstaging [short_path $path] from commit" \ [list $path] \ [concat $after {set ui_status_value {Ready.}}] - } - ?? { + } elseif {$w eq $ui_workdir} { update_index \ "Adding [short_path $path]" \ [list $path] \ [concat $after {set ui_status_value {Ready.}}] } - } } else { show_diff $path $w $lno } -- 2.26.2