git-am.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2005, 2006 Junio C Hamano
   4
   5 SUBDIRECTORY_OK=Yes
   6 OPTIONS_KEEPDASHDASH=
   7 OPTIONS_STUCKLONG=t
   8 OPTIONS_SPEC="\
   9 git am [options] [(<mbox>|<Maildir>)...]
  10 git am [options] (--continue | --skip | --abort)
  11 --
  12 i,interactive   run interactively
  13 b,binary*       (historical option -- no-op)
  14 3,3way          allow fall back on 3way merging if needed
  15 q,quiet         be quiet
  16 s,signoff       add a Signed-off-by line to the commit message
  17 u,utf8          recode into utf8 (default)
  18 k,keep          pass -k flag to git-mailinfo
  19 keep-non-patch  pass -b flag to git-mailinfo
  20 keep-cr         pass --keep-cr flag to git-mailsplit for mbox format
  21 no-keep-cr      do not pass --keep-cr flag to git-mailsplit independent of am.keepcr
  22 c,scissors      strip everything before a scissors line
  23 whitespace=     pass it through git-apply
  24 ignore-space-change pass it through git-apply
  25 ignore-whitespace pass it through git-apply
  26 directory=      pass it through git-apply
  27 exclude=        pass it through git-apply
  28 include=        pass it through git-apply
  29 C=              pass it through git-apply
  30 p=              pass it through git-apply
  31 patch-format=   format the patch(es) are in
  32 reject          pass it through git-apply
  33 resolvemsg=     override error message when patch failure occurs
  34 continue        continue applying patches after resolving a conflict
  35 r,resolved      synonyms for --continue
  36 skip            skip the current patch
  37 abort           restore the original branch and abort the patching operation.
  38 committer-date-is-author-date    lie about committer date
  39 ignore-date     use current timestamp for author date
  40 rerere-autoupdate update the index with reused conflict resolution if possible
  41 S,gpg-sign?     GPG-sign commits
  42 rebasing*       (internal use for git-rebase)"
  43
  44 . git-sh-setup
  45 . git-sh-i18n
  46 prefix=$(git rev-parse --show-prefix)
  47 set_reflog_action am
  48 require_work_tree
  49 cd_to_toplevel
  50
  51 git var GIT_COMMITTER_IDENT >/dev/null ||
  52         die "$(gettext "You need to set your committer info first")"
  53
  54 if git rev-parse --verify -q HEAD >/dev/null
  55 then
  56         HAS_HEAD=yes
  57 else
  58         HAS_HEAD=
  59 fi
  60
  61 cmdline="git am"
  62 if test '' != "$interactive"
  63 then
  64         cmdline="$cmdline -i"
  65 fi
  66 if test '' != "$threeway"
  67 then
  68         cmdline="$cmdline -3"
  69 fi
  70
  71 empty_tree=4b825dc642cb6eb9a060e54bf8d69288fbee4904
  72
  73 sq () {
  74         git rev-parse --sq-quote "$@"
  75 }
  76
  77 stop_here () {
  78     echo "$1" >"$dotest/next"
  79     git rev-parse --verify -q HEAD >"$dotest/abort-safety"
  80     exit 1
  81 }
  82
  83 safe_to_abort () {
  84         if test -f "$dotest/dirtyindex"
  85         then
  86                 return 1
  87         fi
  88
  89         if ! test -s "$dotest/abort-safety"
  90         then
  91                 return 0
  92         fi
  93
  94         abort_safety=$(cat "$dotest/abort-safety")
  95         if test "z$(git rev-parse --verify -q HEAD)" = "z$abort_safety"
  96         then
  97                 return 0
  98         fi
  99         gettextln "You seem to have moved HEAD since the last 'am' failure.
 100 Not rewinding to ORIG_HEAD" >&2
 101         return 1
 102 }
 103
 104 stop_here_user_resolve () {
 105     if [ -n "$resolvemsg" ]; then
 106             printf '%s\n' "$resolvemsg"
 107             stop_here $1
 108     fi
 109     eval_gettextln "When you have resolved this problem, run \"\$cmdline --continue\".
 110 If you prefer to skip this patch, run \"\$cmdline --skip\" instead.
 111 To restore the original branch and stop patching, run \"\$cmdline --abort\"."
 112
 113     stop_here $1
 114 }
 115
 116 go_next () {
 117         rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
 118                 "$dotest/patch" "$dotest/info"
 119         echo "$next" >"$dotest/next"
 120         this=$next
 121 }
 122
 123 cannot_fallback () {
 124         echo "$1"
 125         gettextln "Cannot fall back to three-way merge."
 126         exit 1
 127 }
 128
 129 fall_back_3way () {
 130     O_OBJECT=$(cd "$GIT_OBJECT_DIRECTORY" && pwd)
 131
 132     rm -fr "$dotest"/patch-merge-*
 133     mkdir "$dotest/patch-merge-tmp-dir"
 134
 135     # First see if the patch records the index info that we can use.
 136     cmd="git apply $git_apply_opt --build-fake-ancestor" &&
 137     cmd="$cmd "'"$dotest/patch-merge-tmp-index" "$dotest/patch"' &&
 138     eval "$cmd" &&
 139     GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
 140     git write-tree >"$dotest/patch-merge-base+" ||
 141     cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")"
 142
 143     say "$(gettext "Using index info to reconstruct a base tree...")"
 144
 145     cmd='GIT_INDEX_FILE="$dotest/patch-merge-tmp-index"'
 146
 147     if test -z "$GIT_QUIET"
 148     then
 149         eval "$cmd git diff-index --cached --diff-filter=AM --name-status HEAD"
 150     fi
 151
 152     cmd="$cmd git apply --cached $git_apply_opt"' <"$dotest/patch"'
 153     if eval "$cmd"
 154     then
 155         mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
 156         mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
 157     else
 158         cannot_fallback "$(gettext "Did you hand edit your patch?
 159 It does not apply to blobs recorded in its index.")"
 160     fi
 161
 162     test -f "$dotest/patch-merge-index" &&
 163     his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git write-tree) &&
 164     orig_tree=$(cat "$dotest/patch-merge-base") &&
 165     rm -fr "$dotest"/patch-merge-* || exit 1
 166
 167     say "$(gettext "Falling back to patching base and 3-way merge...")"
 168
 169     # This is not so wrong.  Depending on which base we picked,
 170     # orig_tree may be wildly different from ours, but his_tree
 171     # has the same set of wildly different changes in parts the
 172     # patch did not touch, so recursive ends up canceling them,
 173     # saying that we reverted all those changes.
 174
 175     eval GITHEAD_$his_tree='"$FIRSTLINE"'
 176     export GITHEAD_$his_tree
 177     if test -n "$GIT_QUIET"
 178     then
 179             GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY
 180     fi
 181     our_tree=$(git rev-parse --verify -q HEAD || echo $empty_tree)
 182     git-merge-recursive $orig_tree -- $our_tree $his_tree || {
 183             git rerere $allow_rerere_autoupdate
 184             die "$(gettext "Failed to merge in the changes.")"
 185     }
 186     unset GITHEAD_$his_tree
 187 }
 188
 189 clean_abort () {
 190         test $# = 0 || echo >&2 "$@"
 191         rm -fr "$dotest"
 192         exit 1
 193 }
 194
 195 patch_format=
 196
 197 check_patch_format () {
 198         # early return if patch_format was set from the command line
 199         if test -n "$patch_format"
 200         then
 201                 return 0
 202         fi
 203
 204         # we default to mbox format if input is from stdin and for
 205         # directories
 206         if test $# = 0 || test "x$1" = "x-" || test -d "$1"
 207         then
 208                 patch_format=mbox
 209                 return 0
 210         fi
 211
 212         # otherwise, check the first few non-blank lines of the first
 213         # patch to try to detect its format
 214         {
 215                 # Start from first line containing non-whitespace
 216                 l1=
 217                 while test -z "$l1"
 218                 do
 219                         read l1 || break
 220                 done
 221                 read l2
 222                 read l3
 223                 case "$l1" in
 224                 "From "* | "From: "*)
 225                         patch_format=mbox
 226                         ;;
 227                 '# This series applies on GIT commit'*)
 228                         patch_format=stgit-series
 229                         ;;
 230                 "# HG changeset patch")
 231                         patch_format=hg
 232                         ;;
 233                 *)
 234                         # if the second line is empty and the third is
 235                         # a From, Author or Date entry, this is very
 236                         # likely an StGIT patch
 237                         case "$l2,$l3" in
 238                         ,"From: "* | ,"Author: "* | ,"Date: "*)
 239                                 patch_format=stgit
 240                                 ;;
 241                         *)
 242                                 ;;
 243                         esac
 244                         ;;
 245                 esac
 246                 if test -z "$patch_format" &&
 247                         test -n "$l1" &&
 248                         test -n "$l2" &&
 249                         test -n "$l3"
 250                 then
 251                         # This begins with three non-empty lines.  Is this a
 252                         # piece of e-mail a-la RFC2822?  Grab all the headers,
 253                         # discarding the indented remainder of folded lines,
 254                         # and see if it looks like that they all begin with the
 255                         # header field names...
 256                         tr -d '\015' <"$1" |
 257                         sed -n -e '/^$/q' -e '/^[       ]/d' -e p |
 258                         sane_egrep -v '^[!-9;-~]+:' >/dev/null ||
 259                         patch_format=mbox
 260                 fi
 261         } < "$1" || clean_abort
 262 }
 263
 264 split_patches () {
 265         case "$patch_format" in
 266         mbox)
 267                 if test t = "$keepcr"
 268                 then
 269                     keep_cr=--keep-cr
 270                 else
 271                     keep_cr=
 272                 fi
 273                 git mailsplit -d"$prec" -o"$dotest" -b $keep_cr -- "$@" > "$dotest/last" ||
 274                 clean_abort
 275                 ;;
 276         stgit-series)
 277                 if test $# -ne 1
 278                 then
 279                         clean_abort "$(gettext "Only one StGIT patch series can be applied at once")"
 280                 fi
 281                 series_dir=$(dirname "$1")
 282                 series_file="$1"
 283                 shift
 284                 {
 285                         set x
 286                         while read filename
 287                         do
 288                                 set "$@" "$series_dir/$filename"
 289                         done
 290                         # remove the safety x
 291                         shift
 292                         # remove the arg coming from the first-line comment
 293                         shift
 294                 } < "$series_file" || clean_abort
 295                 # set the patch format appropriately
 296                 patch_format=stgit
 297                 # now handle the actual StGIT patches
 298                 split_patches "$@"
 299                 ;;
 300         stgit)
 301                 this=0
 302                 for stgit in "$@"
 303                 do
 304                         this=$(expr "$this" + 1)
 305                         msgnum=$(printf "%0${prec}d" $this)
 306                         # Perl version of StGIT parse_patch. The first nonemptyline
 307                         # not starting with Author, From or Date is the
 308                         # subject, and the body starts with the next nonempty
 309                         # line not starting with Author, From or Date
 310                         @@PERL@@ -ne 'BEGIN { $subject = 0 }
 311                                 if ($subject > 1) { print ; }
 312                                 elsif (/^\s+$/) { next ; }
 313                                 elsif (/^Author:/) { s/Author/From/ ; print ;}
 314                                 elsif (/^(From|Date)/) { print ; }
 315                                 elsif ($subject) {
 316                                         $subject = 2 ;
 317                                         print "\n" ;
 318                                         print ;
 319                                 } else {
 320                                         print "Subject: ", $_ ;
 321                                         $subject = 1;
 322                                 }
 323                         ' < "$stgit" > "$dotest/$msgnum" || clean_abort
 324                 done
 325                 echo "$this" > "$dotest/last"
 326                 this=
 327                 msgnum=
 328                 ;;
 329         hg)
 330                 this=0
 331                 for hg in "$@"
 332                 do
 333                         this=$(( $this + 1 ))
 334                         msgnum=$(printf "%0${prec}d" $this)
 335                         # hg stores changeset metadata in #-commented lines preceding
 336                         # the commit message and diff(s). The only metadata we care about
 337                         # are the User and Date (Node ID and Parent are hashes which are
 338                         # only relevant to the hg repository and thus not useful to us)
 339                         # Since we cannot guarantee that the commit message is in
 340                         # git-friendly format, we put no Subject: line and just consume
 341                         # all of the message as the body
 342                         LANG=C LC_ALL=C @@PERL@@ -M'POSIX qw(strftime)' -ne 'BEGIN { $subject = 0 }
 343                                 if ($subject) { print ; }
 344                                 elsif (/^\# User /) { s/\# User/From:/ ; print ; }
 345                                 elsif (/^\# Date /) {
 346                                         my ($hashsign, $str, $time, $tz) = split ;
 347                                         $tz = sprintf "%+05d", (0-$tz)/36;
 348                                         print "Date: " .
 349                                               strftime("%a, %d %b %Y %H:%M:%S ",
 350                                                        localtime($time))
 351                                               . "$tz\n";
 352                                 } elsif (/^\# /) { next ; }
 353                                 else {
 354                                         print "\n", $_ ;
 355                                         $subject = 1;
 356                                 }
 357                         ' <"$hg" >"$dotest/$msgnum" || clean_abort
 358                 done
 359                 echo "$this" >"$dotest/last"
 360                 this=
 361                 msgnum=
 362                 ;;
 363         *)
 364                 if test -n "$patch_format"
 365                 then
 366                         clean_abort "$(eval_gettext "Patch format \$patch_format is not supported.")"
 367                 else
 368                         clean_abort "$(gettext "Patch format detection failed.")"
 369                 fi
 370                 ;;
 371         esac
 372 }
 373
 374 prec=4
 375 dotest="$GIT_DIR/rebase-apply"
 376 sign= utf8=t keep= keepcr= skip= interactive= resolved= rebasing= abort=
 377 resolvemsg= resume= scissors= no_inbody_headers=
 378 git_apply_opt=
 379 committer_date_is_author_date=
 380 ignore_date=
 381 allow_rerere_autoupdate=
 382 gpg_sign_opt=
 383
 384 if test "$(git config --bool --get am.keepcr)" = true
 385 then
 386     keepcr=t
 387 fi
 388
 389 while test $# != 0
 390 do
 391         case "$1" in
 392         -i|--interactive)
 393                 interactive=t ;;
 394         -b|--binary)
 395                 gettextln >&2 "The -b/--binary option has been a no-op for long time, and
 396 it will be removed. Please do not use it anymore."
 397                 ;;
 398         -3|--3way)
 399                 threeway=t ;;
 400         -s|--signoff)
 401                 sign=t ;;
 402         -u|--utf8)
 403                 utf8=t ;; # this is now default
 404         --no-utf8)
 405                 utf8= ;;
 406         -k|--keep)
 407                 keep=t ;;
 408         --keep-non-patch)
 409                 keep=b ;;
 410         -c|--scissors)
 411                 scissors=t ;;
 412         --no-scissors)
 413                 scissors=f ;;
 414         -r|--resolved|--continue)
 415                 resolved=t ;;
 416         --skip)
 417                 skip=t ;;
 418         --abort)
 419                 abort=t ;;
 420         --rebasing)
 421                 rebasing=t threeway=t ;;
 422         --resolvemsg=*)
 423                 resolvemsg="${1#--resolvemsg=}" ;;
 424         --whitespace=*|--directory=*|--exclude=*|--include=*)
 425                 git_apply_opt="$git_apply_opt $(sq "$1")" ;;
 426         -C*|-p*)
 427                 git_apply_opt="$git_apply_opt $(sq "$1")" ;;
 428         --patch-format=*)
 429                 patch_format="${1#--patch-format=}" ;;
 430         --reject|--ignore-whitespace|--ignore-space-change)
 431                 git_apply_opt="$git_apply_opt $1" ;;
 432         --committer-date-is-author-date)
 433                 committer_date_is_author_date=t ;;
 434         --ignore-date)
 435                 ignore_date=t ;;
 436         --rerere-autoupdate|--no-rerere-autoupdate)
 437                 allow_rerere_autoupdate="$1" ;;
 438         -q|--quiet)
 439                 GIT_QUIET=t ;;
 440         --keep-cr)
 441                 keepcr=t ;;
 442         --no-keep-cr)
 443                 keepcr=f ;;
 444         --gpg-sign)
 445                 gpg_sign_opt=-S ;;
 446         --gpg-sign=*)
 447                 gpg_sign_opt="-S${1#--gpg-sign=}" ;;
 448         --)
 449                 shift; break ;;
 450         *)
 451                 usage ;;
 452         esac
 453         shift
 454 done
 455
 456 # If the dotest directory exists, but we have finished applying all the
 457 # patches in them, clear it out.
 458 if test -d "$dotest" &&
 459    test -f "$dotest/last" &&
 460    test -f "$dotest/next" &&
 461    last=$(cat "$dotest/last") &&
 462    next=$(cat "$dotest/next") &&
 463    test $# != 0 &&
 464    test "$next" -gt "$last"
 465 then
 466    rm -fr "$dotest"
 467 fi
 468
 469 if test -d "$dotest" && test -f "$dotest/last" && test -f "$dotest/next"
 470 then
 471         case "$#,$skip$resolved$abort" in
 472         0,*t*)
 473                 # Explicit resume command and we do not have file, so
 474                 # we are happy.
 475                 : ;;
 476         0,)
 477                 # No file input but without resume parameters; catch
 478                 # user error to feed us a patch from standard input
 479                 # when there is already $dotest.  This is somewhat
 480                 # unreliable -- stdin could be /dev/null for example
 481                 # and the caller did not intend to feed us a patch but
 482                 # wanted to continue unattended.
 483                 test -t 0
 484                 ;;
 485         *)
 486                 false
 487                 ;;
 488         esac ||
 489         die "$(eval_gettext "previous rebase directory \$dotest still exists but mbox given.")"
 490         resume=yes
 491
 492         case "$skip,$abort" in
 493         t,t)
 494                 die "$(gettext "Please make up your mind. --skip or --abort?")"
 495                 ;;
 496         t,)
 497                 git rerere clear
 498                 head_tree=$(git rev-parse --verify -q HEAD || echo $empty_tree) &&
 499                 git read-tree --reset -u $head_tree $head_tree &&
 500                 index_tree=$(git write-tree) &&
 501                 git read-tree -m -u $index_tree $head_tree
 502                 git read-tree $head_tree
 503                 ;;
 504         ,t)
 505                 if test -f "$dotest/rebasing"
 506                 then
 507                         exec git rebase --abort
 508                 fi
 509                 git rerere clear
 510                 if safe_to_abort
 511                 then
 512                         head_tree=$(git rev-parse --verify -q HEAD || echo $empty_tree) &&
 513                         git read-tree --reset -u $head_tree $head_tree &&
 514                         index_tree=$(git write-tree) &&
 515                         orig_head=$(git rev-parse --verify -q ORIG_HEAD || echo $empty_tree) &&
 516                         git read-tree -m -u $index_tree $orig_head
 517                         git reset ORIG_HEAD
 518                 fi
 519                 rm -fr "$dotest"
 520                 exit ;;
 521         esac
 522         rm -f "$dotest/dirtyindex"
 523 else
 524         # Possible stray $dotest directory in the independent-run
 525         # case; in the --rebasing case, it is upto the caller
 526         # (git-rebase--am) to take care of stray directories.
 527         if test -d "$dotest" && test -z "$rebasing"
 528         then
 529                 case "$skip,$resolved,$abort" in
 530                 ,,t)
 531                         rm -fr "$dotest"
 532                         exit 0
 533                         ;;
 534                 *)
 535                         die "$(eval_gettext "Stray \$dotest directory found.
 536 Use \"git am --abort\" to remove it.")"
 537                         ;;
 538                 esac
 539         fi
 540
 541         # Make sure we are not given --skip, --continue, or --abort
 542         test "$skip$resolved$abort" = "" ||
 543                 die "$(gettext "Resolve operation not in progress, we are not resuming.")"
 544
 545         # Start afresh.
 546         mkdir -p "$dotest" || exit
 547
 548         if test -n "$prefix" && test $# != 0
 549         then
 550                 first=t
 551                 for arg
 552                 do
 553                         test -n "$first" && {
 554                                 set x
 555                                 first=
 556                         }
 557                         if is_absolute_path "$arg"
 558                         then
 559                                 set "$@" "$arg"
 560                         else
 561                                 set "$@" "$prefix$arg"
 562                         fi
 563                 done
 564                 shift
 565         fi
 566
 567         check_patch_format "$@"
 568
 569         split_patches "$@"
 570
 571         # -i can and must be given when resuming; everything
 572         # else is kept
 573         echo " $git_apply_opt" >"$dotest/apply-opt"
 574         echo "$threeway" >"$dotest/threeway"
 575         echo "$sign" >"$dotest/sign"
 576         echo "$utf8" >"$dotest/utf8"
 577         echo "$keep" >"$dotest/keep"
 578         echo "$scissors" >"$dotest/scissors"
 579         echo "$no_inbody_headers" >"$dotest/no_inbody_headers"
 580         echo "$GIT_QUIET" >"$dotest/quiet"
 581         echo 1 >"$dotest/next"
 582         if test -n "$rebasing"
 583         then
 584                 : >"$dotest/rebasing"
 585         else
 586                 : >"$dotest/applying"
 587                 if test -n "$HAS_HEAD"
 588                 then
 589                         git update-ref ORIG_HEAD HEAD
 590                 else
 591                         git update-ref -d ORIG_HEAD >/dev/null 2>&1
 592                 fi
 593         fi
 594 fi
 595
 596 git update-index -q --refresh
 597
 598 case "$resolved" in
 599 '')
 600         case "$HAS_HEAD" in
 601         '')
 602                 files=$(git ls-files) ;;
 603         ?*)
 604                 files=$(git diff-index --cached --name-only HEAD --) ;;
 605         esac || exit
 606         if test "$files"
 607         then
 608                 test -n "$HAS_HEAD" && : >"$dotest/dirtyindex"
 609                 die "$(eval_gettext "Dirty index: cannot apply patches (dirty: \$files)")"
 610         fi
 611 esac
 612
 613 # Now, decide what command line options we will give to the git
 614 # commands we invoke, based on the result of parsing command line
 615 # options and previous invocation state stored in $dotest/ files.
 616
 617 if test "$(cat "$dotest/utf8")" = t
 618 then
 619         utf8=-u
 620 else
 621         utf8=-n
 622 fi
 623 keep=$(cat "$dotest/keep")
 624 case "$keep" in
 625 t)
 626         keep=-k ;;
 627 b)
 628         keep=-b ;;
 629 *)
 630         keep= ;;
 631 esac
 632 case "$(cat "$dotest/scissors")" in
 633 t)
 634         scissors=--scissors ;;
 635 f)
 636         scissors=--no-scissors ;;
 637 esac
 638 if test "$(cat "$dotest/no_inbody_headers")" = t
 639 then
 640         no_inbody_headers=--no-inbody-headers
 641 else
 642         no_inbody_headers=
 643 fi
 644 if test "$(cat "$dotest/quiet")" = t
 645 then
 646         GIT_QUIET=t
 647 fi
 648 if test "$(cat "$dotest/threeway")" = t
 649 then
 650         threeway=t
 651 fi
 652 git_apply_opt=$(cat "$dotest/apply-opt")
 653 if test "$(cat "$dotest/sign")" = t
 654 then
 655         SIGNOFF=$(git var GIT_COMMITTER_IDENT | sed -e '
 656                         s/>.*/>/
 657                         s/^/Signed-off-by: /'
 658                 )
 659 else
 660         SIGNOFF=
 661 fi
 662
 663 last=$(cat "$dotest/last")
 664 this=$(cat "$dotest/next")
 665 if test "$skip" = t
 666 then
 667         this=$(expr "$this" + 1)
 668         resume=
 669 fi
 670
 671 while test "$this" -le "$last"
 672 do
 673         msgnum=$(printf "%0${prec}d" $this)
 674         next=$(expr "$this" + 1)
 675         test -f "$dotest/$msgnum" || {
 676                 resume=
 677                 go_next
 678                 continue
 679         }
 680
 681         # If we are not resuming, parse and extract the patch information
 682         # into separate files:
 683         #  - info records the authorship and title
 684         #  - msg is the rest of commit log message
 685         #  - patch is the patch body.
 686         #
 687         # When we are resuming, these files are either already prepared
 688         # by the user, or the user can tell us to do so by --continue flag.
 689         case "$resume" in
 690         '')
 691                 if test -f "$dotest/rebasing"
 692                 then
 693                         commit=$(sed -e 's/^From \([0-9a-f]*\) .*/\1/' \
 694                                 -e q "$dotest/$msgnum") &&
 695                         test "$(git cat-file -t "$commit")" = commit ||
 696                                 stop_here $this
 697                         git cat-file commit "$commit" |
 698                         sed -e '1,/^$/d' >"$dotest/msg-clean"
 699                         echo "$commit" >"$dotest/original-commit"
 700                         get_author_ident_from_commit "$commit" >"$dotest/author-script"
 701                         git diff-tree --root --binary --full-index "$commit" >"$dotest/patch"
 702                 else
 703                         git mailinfo $keep $no_inbody_headers $scissors $utf8 "$dotest/msg" "$dotest/patch" \
 704                                 <"$dotest/$msgnum" >"$dotest/info" ||
 705                                 stop_here $this
 706
 707                         # skip pine's internal folder data
 708                         sane_grep '^Author: Mail System Internal Data$' \
 709                                 <"$dotest"/info >/dev/null &&
 710                                 go_next && continue
 711
 712                         test -s "$dotest/patch" || {
 713                                 eval_gettextln "Patch is empty.  Was it split wrong?
 714 If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
 715 To restore the original branch and stop patching run \"\$cmdline --abort\"."
 716                                 stop_here $this
 717                         }
 718                         rm -f "$dotest/original-commit" "$dotest/author-script"
 719                         {
 720                                 sed -n '/^Subject/ s/Subject: //p' "$dotest/info"
 721                                 echo
 722                                 cat "$dotest/msg"
 723                         } |
 724                         git stripspace > "$dotest/msg-clean"
 725                 fi
 726                 ;;
 727         esac
 728
 729         if test -f "$dotest/author-script"
 730         then
 731                 eval $(cat "$dotest/author-script")
 732         else
 733                 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
 734                 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
 735                 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
 736         fi
 737
 738         if test -z "$GIT_AUTHOR_EMAIL"
 739         then
 740                 gettextln "Patch does not have a valid e-mail address."
 741                 stop_here $this
 742         fi
 743
 744         export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
 745
 746         case "$resume" in
 747         '')
 748             if test '' != "$SIGNOFF"
 749             then
 750                 LAST_SIGNED_OFF_BY=$(
 751                     sed -ne '/^Signed-off-by: /p' \
 752                     "$dotest/msg-clean" |
 753                     sed -ne '$p'
 754                 )
 755                 ADD_SIGNOFF=$(
 756                     test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
 757                     test '' = "$LAST_SIGNED_OFF_BY" && echo
 758                     echo "$SIGNOFF"
 759                 })
 760             else
 761                 ADD_SIGNOFF=
 762             fi
 763             {
 764                 if test -s "$dotest/msg-clean"
 765                 then
 766                         cat "$dotest/msg-clean"
 767                 fi
 768                 if test '' != "$ADD_SIGNOFF"
 769                 then
 770                         echo "$ADD_SIGNOFF"
 771                 fi
 772             } >"$dotest/final-commit"
 773             ;;
 774         *)
 775                 case "$resolved$interactive" in
 776                 tt)
 777                         # This is used only for interactive view option.
 778                         git diff-index -p --cached HEAD -- >"$dotest/patch"
 779                         ;;
 780                 esac
 781         esac
 782
 783         resume=
 784         if test "$interactive" = t
 785         then
 786             test -t 0 ||
 787             die "$(gettext "cannot be interactive without stdin connected to a terminal.")"
 788             action=again
 789             while test "$action" = again
 790             do
 791                 gettextln "Commit Body is:"
 792                 echo "--------------------------"
 793                 cat "$dotest/final-commit"
 794                 echo "--------------------------"
 795                 # TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
 796                 # in your translation. The program will only accept English
 797                 # input at this point.
 798                 gettext "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
 799                 read reply
 800                 case "$reply" in
 801                 [yY]*) action=yes ;;
 802                 [aA]*) action=yes interactive= ;;
 803                 [nN]*) action=skip ;;
 804                 [eE]*) git_editor "$dotest/final-commit"
 805                        action=again ;;
 806                 [vV]*) action=again
 807                        git_pager "$dotest/patch" ;;
 808                 *)     action=again ;;
 809                 esac
 810             done
 811         else
 812             action=yes
 813         fi
 814
 815         if test $action = skip
 816         then
 817                 go_next
 818                 continue
 819         fi
 820
 821         if test -x "$GIT_DIR"/hooks/applypatch-msg
 822         then
 823                 "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" ||
 824                 stop_here $this
 825         fi
 826
 827         if test -f "$dotest/final-commit"
 828         then
 829                 FIRSTLINE=$(sed 1q "$dotest/final-commit")
 830         else
 831                 FIRSTLINE=""
 832         fi
 833
 834         say "$(eval_gettext "Applying: \$FIRSTLINE")"
 835
 836         case "$resolved" in
 837         '')
 838                 # When we are allowed to fall back to 3-way later, don't give
 839                 # false errors during the initial attempt.
 840                 squelch=
 841                 if test "$threeway" = t
 842                 then
 843                         squelch='>/dev/null 2>&1 '
 844                 fi
 845                 eval "git apply $squelch$git_apply_opt"' --index "$dotest/patch"'
 846                 apply_status=$?
 847                 ;;
 848         t)
 849                 # Resolved means the user did all the hard work, and
 850                 # we do not have to do any patch application.  Just
 851                 # trust what the user has in the index file and the
 852                 # working tree.
 853                 resolved=
 854                 git diff-index --quiet --cached HEAD -- && {
 855                         gettextln "No changes - did you forget to use 'git add'?
 856 If there is nothing left to stage, chances are that something else
 857 already introduced the same changes; you might want to skip this patch."
 858                         stop_here_user_resolve $this
 859                 }
 860                 unmerged=$(git ls-files -u)
 861                 if test -n "$unmerged"
 862                 then
 863                         gettextln "You still have unmerged paths in your index
 864 did you forget to use 'git add'?"
 865                         stop_here_user_resolve $this
 866                 fi
 867                 apply_status=0
 868                 git rerere
 869                 ;;
 870         esac
 871
 872         if test $apply_status != 0 && test "$threeway" = t
 873         then
 874                 if (fall_back_3way)
 875                 then
 876                     # Applying the patch to an earlier tree and merging the
 877                     # result may have produced the same tree as ours.
 878                     git diff-index --quiet --cached HEAD -- && {
 879                         say "$(gettext "No changes -- Patch already applied.")"
 880                         go_next
 881                         continue
 882                     }
 883                     # clear apply_status -- we have successfully merged.
 884                     apply_status=0
 885                 fi
 886         fi
 887         if test $apply_status != 0
 888         then
 889                 eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
 890                 if test "$(git config --bool advice.amworkdir)" != false
 891                 then
 892                         eval_gettextln 'The copy of the patch that failed is found in:
 893    $dotest/patch'
 894                 fi
 895                 stop_here_user_resolve $this
 896         fi
 897
 898         if test -x "$GIT_DIR"/hooks/pre-applypatch
 899         then
 900                 "$GIT_DIR"/hooks/pre-applypatch || stop_here $this
 901         fi
 902
 903         tree=$(git write-tree) &&
 904         commit=$(
 905                 if test -n "$ignore_date"
 906                 then
 907                         GIT_AUTHOR_DATE=
 908                 fi
 909                 parent=$(git rev-parse --verify -q HEAD) ||
 910                 say >&2 "$(gettext "applying to an empty history")"
 911
 912                 if test -n "$committer_date_is_author_date"
 913                 then
 914                         GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
 915                         export GIT_COMMITTER_DATE
 916                 fi &&
 917                 git commit-tree ${parent:+-p} $parent ${gpg_sign_opt:+"$gpg_sign_opt"} $tree  \
 918                         <"$dotest/final-commit"
 919         ) &&
 920         git update-ref -m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD $commit $parent ||
 921         stop_here $this
 922
 923         if test -f "$dotest/original-commit"; then
 924                 echo "$(cat "$dotest/original-commit") $commit" >> "$dotest/rewritten"
 925         fi
 926
 927         if test -x "$GIT_DIR"/hooks/post-applypatch
 928         then
 929                 "$GIT_DIR"/hooks/post-applypatch
 930         fi
 931
 932         go_next
 933 done
 934
 935 if test -s "$dotest"/rewritten; then
 936     git notes copy --for-rewrite=rebase < "$dotest"/rewritten
 937     if test -x "$GIT_DIR"/hooks/post-rewrite; then
 938         "$GIT_DIR"/hooks/post-rewrite rebase < "$dotest"/rewritten
 939     fi
 940 fi
 941
 942 # If am was called with --rebasing (from git-rebase--am), it's up to
 943 # the caller to take care of housekeeping.
 944 if ! test -f "$dotest/rebasing"
 945 then
 946         rm -fr "$dotest"
 947         git gc --auto
 948 fi