You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
103 lines
2.5 KiB
103 lines
2.5 KiB
# 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, older (9.x) versions of FreeBSD /bin/sh misbehave on such a |
|
# construct and continue 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 \ |
|
$allow_rerere_autoupdate --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 \ |
|
$git_format_patch_opt \ |
|
"$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 $ret |
|
fi |
|
|
|
git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \ |
|
$allow_rerere_autoupdate \ |
|
${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
|
|
|