mirror of
https://github.com/git/git.git
synced 2024-11-06 09:13:01 +01:00
e481af06be
'format-patch' could fail due to reasons such as out of memory. Such failures are not detected or handled, which causes rebase to incorrectly think that it completed successfully and continue with cleanup. i.e. calling move_to_original_branch Instead of using a pipe, we separate 'format-patch' and 'am' by using an intermediate file. This gurantees that we can invoke 'am' with the complete input, or not invoking 'am' at all if 'format-patch' failed. Also remove the use of '&&' at the end of the if-block, and rearrange the 'write_basic_state' and 'move_to_original_branch' to make the logic flow a bit better and easier to read. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
74 lines
1.4 KiB
Bash
74 lines
1.4 KiB
Bash
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2010 Junio C Hamano.
|
|
#
|
|
|
|
case "$action" in
|
|
continue)
|
|
git am --resolved --resolvemsg="$resolvemsg" &&
|
|
move_to_original_branch
|
|
exit
|
|
;;
|
|
skip)
|
|
git am --skip --resolvemsg="$resolvemsg" &&
|
|
move_to_original_branch
|
|
exit
|
|
;;
|
|
esac
|
|
|
|
test -n "$rebase_root" && root_flag=--root
|
|
|
|
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 --allow-empty "$revisions"
|
|
ret=$?
|
|
else
|
|
rm -f "$GIT_DIR/rebased-patches"
|
|
|
|
git format-patch -k --stdout --full-index --ignore-if-in-upstream \
|
|
--src-prefix=a/ --dst-prefix=b/ \
|
|
--no-renames $root_flag "$revisions" >"$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
|
|
exit $?
|
|
fi
|
|
|
|
git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" <"$GIT_DIR/rebased-patches"
|
|
ret=$?
|
|
|
|
rm -f "$GIT_DIR/rebased-patches"
|
|
fi
|
|
|
|
if test 0 != $ret
|
|
then
|
|
test -d "$state_dir" && write_basic_state
|
|
exit $ret
|
|
fi
|
|
|
|
move_to_original_branch
|