Andrew's git - gitweb.git/blob

   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, 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.
  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                --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                "$revisions" ${restrict_revision+^$restrict_revision} \
  57                >"$GIT_DIR/rebased-patches"
  58        ret=$?
  59
  60        if test 0 != $ret
  61        then
  62                rm -f "$GIT_DIR/rebased-patches"
  63                case "$head_name" in
  64                refs/heads/*)
  65                        git checkout -q "$head_name"
  66                        ;;
  67                *)
  68                        git checkout -q "$orig_head"
  69                        ;;
  70                esac
  71
  72                cat >&2 <<-EOF
  73
  74                git encountered an error while preparing the patches to replay
  75                these revisions:
  76
  77                    $revisions
  78
  79                As a result, git cannot rebase them.
  80                EOF
  81                return $ret
  82        fi
  83
  84        git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \
  85                ${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches"
  86        ret=$?
  87
  88        rm -f "$GIT_DIR/rebased-patches"
  89fi
  90
  91if test 0 != $ret
  92then
  93        test -d "$state_dir" && write_basic_state
  94        return $ret
  95fi
  96
  97move_to_original_branch
  98
  99}
 100# ... and then we call the whole thing.
 101git_rebase__am