2013-11-25 22:03:52 +01:00
|
|
|
# This shell script fragment is sourced by git-rebase to implement
|
|
|
|
# its default, fast, patch-based, non-interactive mode.
|
2011-02-06 19:43:48 +01:00
|
|
|
#
|
|
|
|
# Copyright (c) 2010 Junio C Hamano.
|
|
|
|
#
|
|
|
|
|
2014-04-11 10:28:17 +02:00
|
|
|
# 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 () {
|
|
|
|
|
2011-02-06 19:43:48 +01:00
|
|
|
case "$action" in
|
|
|
|
continue)
|
2014-02-10 02:03:37 +01:00
|
|
|
git am --resolved --resolvemsg="$resolvemsg" \
|
|
|
|
${gpg_sign_opt:+"$gpg_sign_opt"} &&
|
2011-02-06 19:43:48 +01:00
|
|
|
move_to_original_branch
|
2013-05-12 13:56:38 +02:00
|
|
|
return
|
2011-02-06 19:43:48 +01:00
|
|
|
;;
|
|
|
|
skip)
|
2011-02-06 19:43:58 +01:00
|
|
|
git am --skip --resolvemsg="$resolvemsg" &&
|
2011-02-06 19:43:48 +01:00
|
|
|
move_to_original_branch
|
2013-05-12 13:56:38 +02:00
|
|
|
return
|
2011-02-06 19:43:48 +01:00
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
test -n "$rebase_root" && root_flag=--root
|
|
|
|
|
2012-10-11 05:54:03 +02:00
|
|
|
ret=0
|
2012-04-20 16:36:17 +02:00
|
|
|
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
|
2014-02-10 02:03:37 +01:00
|
|
|
git cherry-pick ${gpg_sign_opt:+"$gpg_sign_opt"} --allow-empty "$revisions"
|
2012-10-11 05:54:03 +02:00
|
|
|
ret=$?
|
2012-04-20 16:36:17 +02:00
|
|
|
else
|
2012-10-11 05:54:03 +02:00
|
|
|
rm -f "$GIT_DIR/rebased-patches"
|
|
|
|
|
2012-04-20 16:36:17 +02:00
|
|
|
git format-patch -k --stdout --full-index --ignore-if-in-upstream \
|
2013-04-15 00:27:04 +02:00
|
|
|
--src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
|
|
|
|
$root_flag "$revisions" >"$GIT_DIR/rebased-patches"
|
2012-10-11 05:54:03 +02:00
|
|
|
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
|
2013-05-12 13:56:38 +02:00
|
|
|
return $?
|
2012-10-11 05:54:03 +02:00
|
|
|
fi
|
|
|
|
|
2014-02-10 02:03:37 +01:00
|
|
|
git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \
|
|
|
|
${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches"
|
2012-10-11 05:54:03 +02:00
|
|
|
ret=$?
|
|
|
|
|
|
|
|
rm -f "$GIT_DIR/rebased-patches"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test 0 != $ret
|
|
|
|
then
|
|
|
|
test -d "$state_dir" && write_basic_state
|
2013-05-12 13:56:38 +02:00
|
|
|
return $ret
|
2012-10-11 05:54:03 +02:00
|
|
|
fi
|
2012-04-20 16:36:17 +02:00
|
|
|
|
2012-10-11 05:54:03 +02:00
|
|
|
move_to_original_branch
|
2014-04-11 10:28:17 +02:00
|
|
|
|
|
|
|
}
|
|
|
|
# ... and then we call the whole thing.
|
|
|
|
git_rebase__am
|