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