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