git-gui: Do not offer to stage three-way diff hunks into the index
git-apply does not accept a patch that was generated as a three-way combined diff format such as we see during merge conflicts. If we get such a diff in our diff viewer and try to send it to git-apply it just errors out and the user is left confused wondering why they cannot stage that hunk. Instead of feeding a known to be unacceptable hunk to git-apply we now just disable the stage/unstage context menu option if the hunk came from a three way diff. The user may still be confused about why they cannot work with a combined diff, but at least they are only confused as to why git-gui is not offering them the action. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce committed
Aug 23, 2007 at 02:44 UTC
9c9f5fa97fe078b59be14a6bcabb851745ddd48c
1 file changed
+4
git-gui.sh
+4
@@ -738,6 +738,7 @@ set empty_tree {}
738
set current_branch {}
739
set is_detached 0
740
set current_diff_path {}
741
+set is_3way_diff 0
742
set selected_commit_type new
743
744
######################################################################
@@ -2444,6 +2445,9 @@ proc popup_diff_menu {ctxm x y X Y} {
2445
}
2446
set l "Stage Hunk For Commit"
2447
}
2448
+ if {$::is_3way_diff} {
2449
+ set s disabled
2450
+ }
2451
$ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
2452
tk_popup $ctxm $X $Y
2453
}