From: Shawn O. Pearce <spearce@spearce.org>
Date: Tue, 4 Sep 2007 03:07:59 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: gitgui-0.9.0~82
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4b08aa3fef4258bf27f1bfa11fb9c0a8315c61aa;p=git.git

Merge branch 'maint'

* maint:
  git-gui: Properly set the state of "Stage/Unstage Hunk" action
  git-gui: Fix detaching current branch during checkout
  git-gui: Correct starting of git-remote to handle -w option

Conflicts:

	git-gui.sh
---

4b08aa3fef4258bf27f1bfa11fb9c0a8315c61aa
diff --cc git-gui.sh
index 5635eeae3,44977aa21..b3d447e59
--- a/git-gui.sh
+++ b/git-gui.sh
@@@ -2461,20 -2441,17 +2461,17 @@@ proc popup_diff_menu {ctxm x y X Y} 
  	set ::cursorX $x
  	set ::cursorY $y
  	if {$::ui_index eq $::current_diff_side} {
- 		set s normal
 -		set l "Unstage Hunk From Commit"
 +		set l [mc "Unstage Hunk From Commit"]
  	} else {
- 		if {$current_diff_path eq {}
- 			|| ![info exists file_states($current_diff_path)]
- 			|| {_O} eq [lindex $file_states($current_diff_path) 0]} {
- 			set s disabled
- 		} else {
- 			set s normal
- 		}
 -		set l "Stage Hunk For Commit"
 +		set l [mc "Stage Hunk For Commit"]
  	}
- 	if {$::is_3way_diff} {
+ 	if {$::is_3way_diff
+ 		|| $current_diff_path eq {}
+ 		|| ![info exists file_states($current_diff_path)]
+ 		|| {_O} eq [lindex $file_states($current_diff_path) 0]} {
  		set s disabled
+ 	} else {
+ 		set s normal
  	}
  	$ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
  	tk_popup $ctxm $X $Y