mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: Factor out common fast-forward merge case

Browse Source 
In both the ff and reset merge_types supported by checkout_op the
result is the same if the merge base of our target commit and the
existing commit is the existing commit: its a fast-forward as the
existing commit is fully contained in the target commit.

This minor cleanup in logic will make it easier to implement a
new kind of merge_type that actually merges the two trees with a
real merge strategy, such as git-merge-recursive.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce
2007-07-20 03:34:56 -04:00
parent 60f7352fe1
commit f66b8a68f2
1 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/checkout_op.tcl
View File

@ -182,27 +182,23 @@ method _update_ref {} {
# #
} else { } else {
catch {set merge_base [git merge-base $new $cur]} catch {set merge_base [git merge-base $new $cur]}
if {$merge_base eq $cur} {
# The current branch is older.
#
set reflog_msg "merge $new_expr: Fast-forward"
} else {
switch -- $merge_type { switch -- $merge_type {
ff { ff {
if {$merge_base eq $new} { if {$merge_base eq $new} {
# The current branch is actually newer. # The current branch is actually newer.
# #
set new $cur set new $cur
} elseif {$merge_base eq $cur} {
# The current branch is older.
#
set reflog_msg "merge $new_expr: Fast-forward"
} else { } else {
_error $this "Branch '$newbranch' already exists.\n\nIt cannot fast-forward to $new_expr.\nA merge is required." _error $this "Branch '$newbranch' already exists.\n\nIt cannot fast-forward to $new_expr.\nA merge is required."
return 0 return 0
} }
} }
reset { reset {
if {$merge_base eq $cur} {
# The current branch is older.
#
set reflog_msg "merge $new_expr: Fast-forward"
} else {
# The current branch will lose things. # The current branch will lose things.
# #
if {[_confirm_reset $this $cur]} { if {[_confirm_reset $this $cur]} {
@ -211,13 +207,13 @@ method _update_ref {} {
return 0 return 0
} }
} }
}
default { default {
_error $this "Only 'ff' and 'reset' merge is currently supported." _error $this "Only 'ff' and 'reset' merge is currently supported."
return 0 return 0
} }
} }
} }
}
if {$new ne $cur} { if {$new ne $cur} {
if {$is_current} { if {$is_current} {