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