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