mirror of
https://github.com/git/git.git
synced 2024-11-13 20:53:02 +01:00
c5e610be50
Since 22db240 (git-am: propagate --3way options as well, 2008-12-04),
the --3way has been propageted across failure, so it is since
pointless to pass it to git-am when resuming.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
30 lines
615 B
Bash
30 lines
615 B
Bash
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2010 Junio C Hamano.
|
|
#
|
|
|
|
. git-sh-setup
|
|
|
|
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
|
|
|
|
git format-patch -k --stdout --full-index --ignore-if-in-upstream \
|
|
--src-prefix=a/ --dst-prefix=b/ \
|
|
--no-renames $root_flag "$revisions" |
|
|
git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" &&
|
|
move_to_original_branch
|
|
ret=$?
|
|
test 0 != $ret -a -d "$state_dir" && write_basic_state
|
|
exit $ret
|