Andrew's git - gitweb.git/blob

   1#!/bin/sh
   2#
   3# Copyright (c) 2010 Junio C Hamano.
   4#
   5
   6. git-sh-setup
   7
   8case "$action" in
   9continue)
  10        git am --resolved --resolvemsg="$resolvemsg" &&
  11        move_to_original_branch
  12        exit
  13        ;;
  14skip)
  15        git am --skip --resolvemsg="$resolvemsg" &&
  16        move_to_original_branch
  17        exit
  18        ;;
  19esac
  20
  21test -n "$rebase_root" && root_flag=--root
  22
  23if test -n "$keep_empty"
  24then
  25        # we have to do this the hard way.  git format-patch completely squashes
  26        # empty commits and even if it didn't the format doesn't really lend
  27        # itself well to recording empty patches.  fortunately, cherry-pick
  28        # makes this easy
  29        git cherry-pick --allow-empty "$revisions"
  30else
  31        git format-patch -k --stdout --full-index --ignore-if-in-upstream \
  32                --src-prefix=a/ --dst-prefix=b/ \
  33                --no-renames $root_flag "$revisions" |
  34        git am $git_am_opt --rebasing --resolvemsg="$resolvemsg"
  35fi && move_to_original_branch
  36
  37ret=$?
  38test 0 != $ret -a -d "$state_dir" && write_basic_state
  39exit $ret