@matheusbsbs / matheus-bagliano / commits / 60f7352fe1
Fork 0

git-gui: Save the merge base during checkout_op processing

I've decided to teach checkout_op how to perform more than just a fast-forward and reset type of merge. This way we can also do a full recursive merge even when we are recreating an existing branch from a remote. To help with that process I'm saving the merge-base we computed during the ff/reset/fail decision process, in case we need it later on when we actually start a true merge operation. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Shawn O. Pearce committed Jul 20, 2007 at 02:13 UTC 60f7352fe1ae3d42ca7bd7611b6b787ff70cd813
1 file changed +5 -5
lib/checkout_op.tcl
+5 -5
@@ -12,6 +12,7 @@ field new_ref ; # ref we are updating/creating
12
13 field parent_w .; # window that started us
14 field merge_type none; # type of merge to apply to existing branch
15 +field merge_base {}; # merge base if we have another ref involved
16 field fetch_spec {}; # refetch tracking branch if used?
17 field checkout 1; # actually checkout the branch?
18 field create 0; # create the branch if it doesn't exist?
@@ -180,15 +181,14 @@ method _update_ref {} {
181 # No merge would be required, don't compute anything.
182 #
183 } else {
183 - set mrb {}
184 - catch {set mrb [git merge-base $new $cur]}
184 + catch {set merge_base [git merge-base $new $cur]}
185 switch -- $merge_type {
186 ff {
187 - if {$mrb eq $new} {
187 + if {$merge_base eq $new} {
188 # The current branch is actually newer.
189 #
190 set new $cur
191 - } elseif {$mrb eq $cur} {
191 + } elseif {$merge_base eq $cur} {
192 # The current branch is older.
193 #
194 set reflog_msg "merge $new_expr: Fast-forward"
@@ -198,7 +198,7 @@ method _update_ref {} {
198 }
199 }
200 reset {
201 - if {$mrb eq $cur} {
201 + if {$merge_base eq $cur} {
202 # The current branch is older.
203 #
204 set reflog_msg "merge $new_expr: Fast-forward"