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