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