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