index_has_changes(): avoid assuming operating on the_index
[git/debian.git] / git-rebase--am.sh
blobbe3f068922c5a3ba0d1112f3b8b1cf1228567d2e
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 show-current-patch)
31 exec git am --show-current-patch
33 esac
35 if test -z "$rebase_root"
36 # this is now equivalent to ! -z "$upstream"
37 then
38 revisions=$upstream...$orig_head
39 else
40 revisions=$onto...$orig_head
43 ret=0
44 if test -n "$keep_empty"
45 then
46 # we have to do this the hard way. git format-patch completely squashes
47 # empty commits and even if it didn't the format doesn't really lend
48 # itself well to recording empty patches. fortunately, cherry-pick
49 # makes this easy
50 git cherry-pick ${gpg_sign_opt:+"$gpg_sign_opt"} --allow-empty \
51 $allow_rerere_autoupdate --right-only "$revisions" \
52 $allow_empty_message \
53 ${restrict_revision+^$restrict_revision}
54 ret=$?
55 else
56 rm -f "$GIT_DIR/rebased-patches"
58 git format-patch -k --stdout --full-index --cherry-pick --right-only \
59 --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
60 --pretty=mboxrd \
61 $git_format_patch_opt \
62 "$revisions" ${restrict_revision+^$restrict_revision} \
63 >"$GIT_DIR/rebased-patches"
64 ret=$?
66 if test 0 != $ret
67 then
68 rm -f "$GIT_DIR/rebased-patches"
69 case "$head_name" in
70 refs/heads/*)
71 git checkout -q "$head_name"
74 git checkout -q "$orig_head"
76 esac
78 cat >&2 <<-EOF
80 git encountered an error while preparing the patches to replay
81 these revisions:
83 $revisions
85 As a result, git cannot rebase them.
86 EOF
87 return $ret
90 git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \
91 --patch-format=mboxrd \
92 $allow_rerere_autoupdate \
93 ${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches"
94 ret=$?
96 rm -f "$GIT_DIR/rebased-patches"
99 if test 0 != $ret
100 then
101 test -d "$state_dir" && write_basic_state
102 return $ret
105 move_to_original_branch
108 # ... and then we call the whole thing.
109 git_rebase__am