Martin von Zweigbergk | 46df82d | 2011-02-06 13:43:48 -0500 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | # |
| 3 | # Copyright (c) 2010 Junio C Hamano. |
| 4 | # |
| 5 | |
Martin von Zweigbergk | 46df82d | 2011-02-06 13:43:48 -0500 | [diff] [blame] | 6 | case "$action" in |
| 7 | continue) |
Martin von Zweigbergk | c5e610b | 2011-02-06 13:43:58 -0500 | [diff] [blame] | 8 | git am --resolved --resolvemsg="$resolvemsg" && |
Martin von Zweigbergk | 46df82d | 2011-02-06 13:43:48 -0500 | [diff] [blame] | 9 | move_to_original_branch |
Ramkumar Ramachandra | a1549e1 | 2013-05-12 17:26:38 +0530 | [diff] [blame] | 10 | return |
Martin von Zweigbergk | 46df82d | 2011-02-06 13:43:48 -0500 | [diff] [blame] | 11 | ;; |
| 12 | skip) |
Martin von Zweigbergk | c5e610b | 2011-02-06 13:43:58 -0500 | [diff] [blame] | 13 | git am --skip --resolvemsg="$resolvemsg" && |
Martin von Zweigbergk | 46df82d | 2011-02-06 13:43:48 -0500 | [diff] [blame] | 14 | move_to_original_branch |
Ramkumar Ramachandra | a1549e1 | 2013-05-12 17:26:38 +0530 | [diff] [blame] | 15 | return |
Martin von Zweigbergk | 46df82d | 2011-02-06 13:43:48 -0500 | [diff] [blame] | 16 | ;; |
| 17 | esac |
| 18 | |
| 19 | test -n "$rebase_root" && root_flag=--root |
| 20 | |
Andrew Wong | e481af0 | 2012-10-10 23:54:03 -0400 | [diff] [blame] | 21 | ret=0 |
Neil Horman | 90e1818 | 2012-04-20 10:36:17 -0400 | [diff] [blame] | 22 | if test -n "$keep_empty" |
| 23 | then |
| 24 | # we have to do this the hard way. git format-patch completely squashes |
| 25 | # empty commits and even if it didn't the format doesn't really lend |
| 26 | # itself well to recording empty patches. fortunately, cherry-pick |
| 27 | # makes this easy |
| 28 | git cherry-pick --allow-empty "$revisions" |
Andrew Wong | e481af0 | 2012-10-10 23:54:03 -0400 | [diff] [blame] | 29 | ret=$? |
Neil Horman | 90e1818 | 2012-04-20 10:36:17 -0400 | [diff] [blame] | 30 | else |
Andrew Wong | e481af0 | 2012-10-10 23:54:03 -0400 | [diff] [blame] | 31 | rm -f "$GIT_DIR/rebased-patches" |
| 32 | |
Neil Horman | 90e1818 | 2012-04-20 10:36:17 -0400 | [diff] [blame] | 33 | git format-patch -k --stdout --full-index --ignore-if-in-upstream \ |
Felipe Contreras | 0597ffa | 2013-04-14 17:27:04 -0500 | [diff] [blame] | 34 | --src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \ |
| 35 | $root_flag "$revisions" >"$GIT_DIR/rebased-patches" |
Andrew Wong | e481af0 | 2012-10-10 23:54:03 -0400 | [diff] [blame] | 36 | ret=$? |
Neil Horman | 90e1818 | 2012-04-20 10:36:17 -0400 | [diff] [blame] | 37 | |
Andrew Wong | e481af0 | 2012-10-10 23:54:03 -0400 | [diff] [blame] | 38 | if test 0 != $ret |
| 39 | then |
| 40 | rm -f "$GIT_DIR/rebased-patches" |
| 41 | case "$head_name" in |
| 42 | refs/heads/*) |
| 43 | git checkout -q "$head_name" |
| 44 | ;; |
| 45 | *) |
| 46 | git checkout -q "$orig_head" |
| 47 | ;; |
| 48 | esac |
| 49 | |
| 50 | cat >&2 <<-EOF |
| 51 | |
| 52 | git encountered an error while preparing the patches to replay |
| 53 | these revisions: |
| 54 | |
| 55 | $revisions |
| 56 | |
| 57 | As a result, git cannot rebase them. |
| 58 | EOF |
Ramkumar Ramachandra | a1549e1 | 2013-05-12 17:26:38 +0530 | [diff] [blame] | 59 | return $? |
Andrew Wong | e481af0 | 2012-10-10 23:54:03 -0400 | [diff] [blame] | 60 | fi |
| 61 | |
| 62 | git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" <"$GIT_DIR/rebased-patches" |
| 63 | ret=$? |
| 64 | |
| 65 | rm -f "$GIT_DIR/rebased-patches" |
| 66 | fi |
| 67 | |
| 68 | if test 0 != $ret |
| 69 | then |
| 70 | test -d "$state_dir" && write_basic_state |
Ramkumar Ramachandra | a1549e1 | 2013-05-12 17:26:38 +0530 | [diff] [blame] | 71 | return $ret |
Andrew Wong | e481af0 | 2012-10-10 23:54:03 -0400 | [diff] [blame] | 72 | fi |
| 73 | |
| 74 | move_to_original_branch |