mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
![John Keeping](/assets/img/avatar_default.png)
When the `--fork-point` argument was added to `git rebase`, we changed the value of $upstream to be the fork point instead of the point from which we want to rebase. When $orig_head..$upstream is empty this does not change the behaviour, but when there are new changes in the upstream we are no longer checking if any of them are patch-identical with changes in $upstream..$orig_head. Fix this by introducing a new variable to hold the fork point and using this to restrict the range as an extra (negative) revision argument so that the set of desired revisions becomes (in fork-point mode): git rev-list --cherry-pick --right-only \ $upstream...$orig_head ^$fork_point This allows us to correctly handle the scenario where we have the following topology: C --- D --- E <- dev / B <- master@{1} / o --- B' --- C* --- D* <- master where: - B' is a fixed-up version of B that is not patch-identical with B; - C* and D* are patch-identical to C and D respectively and conflict textually if applied in the wrong order; - E depends textually on D. The correct result of `git rebase master dev` is that B is identified as the fork-point of dev and master, so that C, D, E are the commits that need to be replayed onto master; but C and D are patch-identical with C* and D* and so can be dropped, so that the end result is: o --- B' --- C* --- D* --- E <- dev If the fork-point is not identified, then picking B onto a branch containing B' results in a conflict and if the patch-identical commits are not correctly identified then picking C onto a branch containing D (or equivalently D*) results in a conflict. This change allows us to handle both of these cases, where previously we either identified the fork-point (with `--fork-point`) but not the patch-identical commits *or* (with `--no-fork-point`) identified the patch-identical commits but not the fact that master had been rewritten. Reported-by: Ted Felix <ted@tedfelix.com> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
102 lines
2.4 KiB
Bash
102 lines
2.4 KiB
Bash
# This shell script fragment is sourced by git-rebase to implement
|
|
# its default, fast, patch-based, non-interactive mode.
|
|
#
|
|
# Copyright (c) 2010 Junio C Hamano.
|
|
#
|
|
|
|
# The whole contents of this file is run by dot-sourcing it from
|
|
# inside a shell function. It used to be that "return"s we see
|
|
# below were not inside any function, and expected to return
|
|
# to the function that dot-sourced us.
|
|
#
|
|
# However, FreeBSD /bin/sh misbehaves on such a construct and
|
|
# continues to run the statements that follow such a "return".
|
|
# As a work-around, we introduce an extra layer of a function
|
|
# here, and immediately call it after defining it.
|
|
git_rebase__am () {
|
|
|
|
case "$action" in
|
|
continue)
|
|
git am --resolved --resolvemsg="$resolvemsg" \
|
|
${gpg_sign_opt:+"$gpg_sign_opt"} &&
|
|
move_to_original_branch
|
|
return
|
|
;;
|
|
skip)
|
|
git am --skip --resolvemsg="$resolvemsg" &&
|
|
move_to_original_branch
|
|
return
|
|
;;
|
|
esac
|
|
|
|
if test -z "$rebase_root"
|
|
# this is now equivalent to ! -z "$upstream"
|
|
then
|
|
revisions=$upstream...$orig_head
|
|
else
|
|
revisions=$onto...$orig_head
|
|
fi
|
|
|
|
ret=0
|
|
if test -n "$keep_empty"
|
|
then
|
|
# we have to do this the hard way. git format-patch completely squashes
|
|
# empty commits and even if it didn't the format doesn't really lend
|
|
# itself well to recording empty patches. fortunately, cherry-pick
|
|
# makes this easy
|
|
git cherry-pick ${gpg_sign_opt:+"$gpg_sign_opt"} --allow-empty \
|
|
--right-only "$revisions" \
|
|
${restrict_revision+^$restrict_revision}
|
|
ret=$?
|
|
else
|
|
rm -f "$GIT_DIR/rebased-patches"
|
|
|
|
git format-patch -k --stdout --full-index --cherry-pick --right-only \
|
|
--src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
|
|
"$revisions" ${restrict_revision+^$restrict_revision} \
|
|
>"$GIT_DIR/rebased-patches"
|
|
ret=$?
|
|
|
|
if test 0 != $ret
|
|
then
|
|
rm -f "$GIT_DIR/rebased-patches"
|
|
case "$head_name" in
|
|
refs/heads/*)
|
|
git checkout -q "$head_name"
|
|
;;
|
|
*)
|
|
git checkout -q "$orig_head"
|
|
;;
|
|
esac
|
|
|
|
cat >&2 <<-EOF
|
|
|
|
git encountered an error while preparing the patches to replay
|
|
these revisions:
|
|
|
|
$revisions
|
|
|
|
As a result, git cannot rebase them.
|
|
EOF
|
|
return $?
|
|
fi
|
|
|
|
git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \
|
|
${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches"
|
|
ret=$?
|
|
|
|
rm -f "$GIT_DIR/rebased-patches"
|
|
fi
|
|
|
|
if test 0 != $ret
|
|
then
|
|
test -d "$state_dir" && write_basic_state
|
|
return $ret
|
|
fi
|
|
|
|
move_to_original_branch
|
|
|
|
}
|
|
# ... and then we call the whole thing.
|
|
git_rebase__am
|