Sync with maint
[git.git] / git-rebase--am.sh
blobca20e1e66fbda7c27a8a4cfff03ecf02841e1002
1 # This shell script fragment is sourced by git-rebase to implement
2 # its default, fast, patch-based, non-interactive mode.
4 # Copyright (c) 2010 Junio C Hamano.
7 # The whole contents of this file is run by dot-sourcing it from
8 # inside a shell function. It used to be that "return"s we see
9 # below were not inside any function, and expected to return
10 # to the function that dot-sourced us.
12 # However, FreeBSD /bin/sh misbehaves on such a construct and
13 # continues to run the statements that follow such a "return".
14 # As a work-around, we introduce an extra layer of a function
15 # here, and immediately call it after defining it.
16 git_rebase__am () {
18 case "$action" in
19 continue)
20 git am --resolved --resolvemsg="$resolvemsg" \
21 ${gpg_sign_opt:+"$gpg_sign_opt"} &&
22 move_to_original_branch
23 return
25 skip)
26 git am --skip --resolvemsg="$resolvemsg" &&
27 move_to_original_branch
28 return
30 esac
32 test -n "$rebase_root" && root_flag=--root
34 ret=0
35 if test -n "$keep_empty"
36 then
37 # we have to do this the hard way. git format-patch completely squashes
38 # empty commits and even if it didn't the format doesn't really lend
39 # itself well to recording empty patches. fortunately, cherry-pick
40 # makes this easy
41 git cherry-pick ${gpg_sign_opt:+"$gpg_sign_opt"} --allow-empty "$revisions"
42 ret=$?
43 else
44 rm -f "$GIT_DIR/rebased-patches"
46 git format-patch -k --stdout --full-index --ignore-if-in-upstream \
47 --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
48 $root_flag "$revisions" >"$GIT_DIR/rebased-patches"
49 ret=$?
51 if test 0 != $ret
52 then
53 rm -f "$GIT_DIR/rebased-patches"
54 case "$head_name" in
55 refs/heads/*)
56 git checkout -q "$head_name"
59 git checkout -q "$orig_head"
61 esac
63 cat >&2 <<-EOF
65 git encountered an error while preparing the patches to replay
66 these revisions:
68 $revisions
70 As a result, git cannot rebase them.
71 EOF
72 return $?
75 git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \
76 ${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches"
77 ret=$?
79 rm -f "$GIT_DIR/rebased-patches"
82 if test 0 != $ret
83 then
84 test -d "$state_dir" && write_basic_state
85 return $ret
88 move_to_original_branch
91 # ... and then we call the whole thing.
92 git_rebase__am