1# This shell script fragment is sourced by git-rebase to implement 2# its default, fast, patch-based, non-interactive mode. 3# 4# Copyright (c) 2010 Junio C Hamano. 5# 6 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. 11# 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. 16git_rebase__am () { 17 18case "$action" in 19continue) 20 git am --resolved --resolvemsg="$resolvemsg" \ 21 ${gpg_sign_opt:+"$gpg_sign_opt"} && 22 move_to_original_branch 23 return 24 ;; 25skip) 26 git am --skip --resolvemsg="$resolvemsg" && 27 move_to_original_branch 28 return 29 ;; 30esac 31 32if test -z "$rebase_root" 33 # this is now equivalent to ! -z "$upstream" 34then 35 revisions=$upstream...$orig_head 36else 37 revisions=$onto...$orig_head 38fi 39 40ret=0 41if test -n "$keep_empty" 42then 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=$? 51else 52 rm -f "$GIT_DIR/rebased-patches" 53 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 $git_format_patch_opt \ 57 "$revisions" ${restrict_revision+^$restrict_revision} \ 58 >"$GIT_DIR/rebased-patches" 59 ret=$? 60 61 if test 0 != $ret 62 then 63 rm -f "$GIT_DIR/rebased-patches" 64 case "$head_name" in 65 refs/heads/*) 66 git checkout -q "$head_name" 67 ;; 68 *) 69 git checkout -q "$orig_head" 70 ;; 71 esac 72 73 cat >&2 <<-EOF 74 75 git encountered an error while preparing the patches to replay 76 these revisions: 77 78 $revisions 79 80 As a result, git cannot rebase them. 81 EOF 82 return $ret 83 fi 84 85 git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \ 86 $allow_rerere_autoupdate \ 87 ${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches" 88 ret=$? 89 90 rm -f "$GIT_DIR/rebased-patches" 91fi 92 93if test 0 != $ret 94then 95 test -d "$state_dir" && write_basic_state 96 return $ret 97fi 98 99move_to_original_branch 100 101} 102# ... and then we call the whole thing. 103git_rebase__am