Merge branch 'jt/http-redact-cookies' into maint
[git.git] / git-rebase--am.sh
blob14c50782e096966b860d49cbaed7658e9f56958f
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, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
13 # construct and continue 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 if test -z "$rebase_root"
33 # this is now equivalent to ! -z "$upstream"
34 then
35 revisions=$upstream...$orig_head
36 else
37 revisions=$onto...$orig_head
40 ret=0
41 if test -n "$keep_empty"
42 then
43 # we have to do this the hard way. git format-patch completely squashes
44 # empty commits and even if it didn't the format doesn't really lend
45 # itself well to recording empty patches. fortunately, cherry-pick
46 # makes this easy
47 git cherry-pick ${gpg_sign_opt:+"$gpg_sign_opt"} --allow-empty \
48 $allow_rerere_autoupdate --right-only "$revisions" \
49 ${restrict_revision+^$restrict_revision}
50 ret=$?
51 else
52 rm -f "$GIT_DIR/rebased-patches"
54 git format-patch -k --stdout --full-index --cherry-pick --right-only \
55 --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
56 --pretty=mboxrd \
57 $git_format_patch_opt \
58 "$revisions" ${restrict_revision+^$restrict_revision} \
59 >"$GIT_DIR/rebased-patches"
60 ret=$?
62 if test 0 != $ret
63 then
64 rm -f "$GIT_DIR/rebased-patches"
65 case "$head_name" in
66 refs/heads/*)
67 git checkout -q "$head_name"
70 git checkout -q "$orig_head"
72 esac
74 cat >&2 <<-EOF
76 git encountered an error while preparing the patches to replay
77 these revisions:
79 $revisions
81 As a result, git cannot rebase them.
82 EOF
83 return $ret
86 git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \
87 --patch-format=mboxrd \
88 $allow_rerere_autoupdate \
89 ${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches"
90 ret=$?
92 rm -f "$GIT_DIR/rebased-patches"
95 if test 0 != $ret
96 then
97 test -d "$state_dir" && write_basic_state
98 return $ret
101 move_to_original_branch
104 # ... and then we call the whole thing.
105 git_rebase__am