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

rebase: implement --merge via the interactive machinery

Browse Source 
As part of an ongoing effort to make rebase have more uniform behavior,
modify the merge backend to behave like the interactive one, by
re-implementing it on top of the latter.

Interactive rebases are implemented in terms of cherry-pick rather than
the merge-recursive builtin, but cherry-pick also calls into the
recursive merge machinery by default and can accept special merge
strategies and/or special strategy options.  As such, there really is
not any need for having both git-rebase--merge and
git-rebase--interactive anymore.  Delete git-rebase--merge.sh and
instead implement it in builtin/rebase.c.

This results in a few deliberate but small user-visible changes:
  * The progress output is modified (see t3406 and t3420 for examples)
  * A few known test failures are now fixed (see t3421)
  * bash-prompt during a rebase --merge is now REBASE-i instead of
    REBASE-m.  Reason: The prompt is a reflection of the backend in use;
    this allows users to report an issue to the git mailing list with
    the appropriate backend information, and allows advanced users to
    know where to search for relevant control files.  (see t9903)

testcase modification notes:
  t3406: --interactive and --merge had slightly different progress output
         while running; adjust a test to match the new expectation
  t3420: these test precise output while running, but rebase--am,
         rebase--merge, and rebase--interactive all were built on very
         different commands (am, merge-recursive, cherry-pick), so the
         tests expected different output for each type.  Now we expect
         --merge and --interactive to have the same output.
  t3421: --interactive fixes some bugs in --merge!  Wahoo!
  t9903: --merge uses the interactive backend so the prompt expected is
         now REBASE-i.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2018-12-11 08:11:39 -08:00
committed by Junio C Hamano
parent c91c944a06
commit 68aa495b59
10 changed files with 43 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
git-legacy-rebase.sh
View File

@ -218,6 +218,7 @@ then
state_dir="$apply_dir"
elif test -d "$merge_dir"
then
type=interactive
if test -d "$merge_dir"/rewritten
then
type=preserve-merges
@ -225,10 +226,7 @@ then
preserve_merges=t
elif test -f "$merge_dir"/interactive
then
type=interactive
interactive_rebase=explicit
else
type=merge
fi
state_dir="$merge_dir"
fi
@ -477,6 +475,7 @@ then
test -z "$interactive_rebase" && interactive_rebase=implied
fi
actually_interactive=
if test -n "$interactive_rebase"
then
if test -z "$preserve_merges"
@ -485,11 +484,12 @@ then
else
type=preserve-merges
fi
actually_interactive=t
state_dir="$merge_dir"
elif test -n "$do_merge"
then
type=merge
interactive_rebase=implied
type=interactive
state_dir="$merge_dir"
else
type=am
@ -505,13 +505,9 @@ incompatible_opts=$(echo " $git_am_opt " | \
sed -e 's/ -q / /g' -e 's/^ \(.*\) $/\1/')
if test -n "$incompatible_opts"
then
if test -n "$interactive_rebase"
if test -n "$actually_interactive" || test "$do_merge"
then
die "$(gettext "fatal: cannot combine am options with interactive options")"
fi
if test -n "$do_merge"
then
die "$(gettext "fatal: cannot combine am options with merge options")"
die "$(gettext "fatal: cannot combine am options with either interactive or merge options")"
fi
fi
@ -676,7 +672,7 @@ require_clean_work_tree "rebase" "$(gettext "Please commit or stash them.")"
# but this should be done only when upstream and onto are the same
# and if this is not an interactive rebase.
mb=$(git merge-base "$onto" "$orig_head")
if test -z "$interactive_rebase" && test "$upstream" = "$onto" &&
if test -z "$actually_interactive" && test "$upstream" = "$onto" &&
test "$mb" = "$onto" && test -z "$restrict_revision" &&
# linear history?
! (git rev-list --parents "$onto".."$orig_head" | sane_grep " .* ") > /dev/null
@ -726,6 +722,19 @@ then
GIT_PAGER='' git diff --stat --summary "$mb_tree" "$onto"
fi
if test -z "$actually_interactive" && test "$mb" = "$orig_head"
then
say "$(eval_gettext "Fast-forwarded \$branch_name to \$onto_name.")"
GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name" \
git checkout -q "$onto^0" || die "could not detach HEAD"
# If the $onto is a proper descendant of the tip of the branch, then
# we just fast-forwarded.
git update-ref ORIG_HEAD $orig_head
move_to_original_branch
finish_rebase
exit 0
fi
test -n "$interactive_rebase" && run_specific_rebase
# Detach HEAD and reset the tree
@ -735,16 +744,6 @@ GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name" \
git checkout -q "$onto^0" || die "could not detach HEAD"
git update-ref ORIG_HEAD $orig_head
# If the $onto is a proper descendant of the tip of the branch, then
# we just fast-forwarded.
if test "$mb" = "$orig_head"
then
say "$(eval_gettext "Fast-forwarded \$branch_name to \$onto_name.")"
move_to_original_branch
finish_rebase
exit 0
fi
if test -n "$rebase_root"
then
revisions="$onto..$orig_head"