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 303test0-eq"$#"&&set --- 304for stgit in"$@" 305do 306 this=$(expr "$this" + 1) 307 msgnum=$(printf "%0${prec}d" $this) 308# Perl version of StGIT parse_patch. The first nonemptyline 309# not starting with Author, From or Date is the 310# subject, and the body starts with the next nonempty 311# line not starting with Author, From or Date 312 @@PERL@@ -ne'BEGIN {$subject= 0 } 313 if ($subject> 1) { print ; } 314 elsif (/^\s+$/) { next ; } 315 elsif (/^Author:/) { s/Author/From/ ; print ;} 316 elsif (/^(From|Date)/) { print ; } 317 elsif ($subject) { 318$subject= 2 ; 319 print "\n" ; 320 print ; 321 } else { 322 print "Subject: ",$_; 323$subject= 1; 324 } 325 '--"$stgit">"$dotest/$msgnum"|| clean_abort 326done 327echo"$this">"$dotest/last" 328 this= 329 msgnum= 330;; 331 hg) 332 this=0 333test0-eq"$#"&&set --- 334for hg in"$@" 335do 336 this=$(( $this + 1 )) 337 msgnum=$(printf "%0${prec}d" $this) 338# hg stores changeset metadata in #-commented lines preceding 339# the commit message and diff(s). The only metadata we care about 340# are the User and Date (Node ID and Parent are hashes which are 341# only relevant to the hg repository and thus not useful to us) 342# Since we cannot guarantee that the commit message is in 343# git-friendly format, we put no Subject: line and just consume 344# all of the message as the body 345 LANG=C LC_ALL=C @@PERL@@ -M'POSIX qw(strftime)'-ne'BEGIN {$subject= 0 } 346 if ($subject) { print ; } 347 elsif (/^\# User /) { s/\# User/From:/ ; print ; } 348 elsif (/^\# Date /) { 349 my ($hashsign,$str,$time,$tz) = split ; 350$tz_str= sprintf "%+05d", (0-$tz)/36; 351 print "Date: " . 352 strftime("%a, %d %b %Y %H:%M:%S ", 353 gmtime($time-$tz)) 354 . "$tz_str\n"; 355 } elsif (/^\# /) { next ; } 356 else { 357 print "\n",$_; 358$subject= 1; 359 } 360 '--"$hg">"$dotest/$msgnum"|| clean_abort 361done 362echo"$this">"$dotest/last" 363 this= 364 msgnum= 365;; 366*) 367iftest -n"$patch_format" 368then 369 clean_abort "$(eval_gettext "Patch format \$patch_format is not supported.")" 370else 371 clean_abort "$(gettext "Patch format detection failed.")" 372fi 373;; 374esac 375} 376 377prec=4 378dotest="$GIT_DIR/rebase-apply" 379sign= utf8=t keep= keepcr= skip= interactive= resolved= rebasing= abort= 380messageid= resolvemsg= resume= scissors= no_inbody_headers= 381git_apply_opt= 382committer_date_is_author_date= 383ignore_date= 384allow_rerere_autoupdate= 385gpg_sign_opt= 386threeway= 387 388iftest"$(git config --bool --get am.messageid)"= true 389then 390 messageid=t 391fi 392 393iftest"$(git config --bool --get am.keepcr)"= true 394then 395 keepcr=t 396fi 397 398whiletest$#!=0 399do 400case"$1"in 401-i|--interactive) 402 interactive=t ;; 403-b|--binary) 404 gettextln >&2"The -b/--binary option has been a no-op for long time, and 405it will be removed. Please do not use it anymore." 406;; 407-3|--3way) 408 threeway=t ;; 409-s|--signoff) 410 sign=t ;; 411-u|--utf8) 412 utf8=t ;;# this is now default 413--no-utf8) 414 utf8= ;; 415-m|--message-id) 416 messageid=t ;; 417--no-message-id) 418 messageid=f ;; 419-k|--keep) 420 keep=t ;; 421--keep-non-patch) 422 keep=b ;; 423-c|--scissors) 424 scissors=t ;; 425--no-scissors) 426 scissors=f ;; 427-r|--resolved|--continue) 428 resolved=t ;; 429--skip) 430 skip=t ;; 431--abort) 432 abort=t ;; 433--rebasing) 434 rebasing=t threeway=t ;; 435--resolvemsg=*) 436 resolvemsg="${1#--resolvemsg=}";; 437--whitespace=*|--directory=*|--exclude=*|--include=*) 438 git_apply_opt="$git_apply_opt$(sq "$1")";; 439-C*|-p*) 440 git_apply_opt="$git_apply_opt$(sq "$1")";; 441--patch-format=*) 442 patch_format="${1#--patch-format=}";; 443--reject|--ignore-whitespace|--ignore-space-change) 444 git_apply_opt="$git_apply_opt$1";; 445--committer-date-is-author-date) 446 committer_date_is_author_date=t ;; 447--ignore-date) 448 ignore_date=t ;; 449--rerere-autoupdate|--no-rerere-autoupdate) 450 allow_rerere_autoupdate="$1";; 451-q|--quiet) 452 GIT_QUIET=t ;; 453--keep-cr) 454 keepcr=t ;; 455--no-keep-cr) 456 keepcr=f ;; 457--gpg-sign) 458 gpg_sign_opt=-S;; 459--gpg-sign=*) 460 gpg_sign_opt="-S${1#--gpg-sign=}";; 461--) 462shift;break;; 463*) 464 usage ;; 465esac 466shift 467done 468 469# If the dotest directory exists, but we have finished applying all the 470# patches in them, clear it out. 471iftest -d"$dotest"&& 472test -f"$dotest/last"&& 473test -f"$dotest/next"&& 474 last=$(cat "$dotest/last")&& 475 next=$(cat "$dotest/next")&& 476test$#!=0&& 477test"$next"-gt"$last" 478then 479rm-fr"$dotest" 480fi 481 482iftest -d"$dotest"&&test -f"$dotest/last"&&test -f"$dotest/next" 483then 484case"$#,$skip$resolved$abort"in 4850,*t*) 486# Explicit resume command and we do not have file, so 487# we are happy. 488: ;; 4890,) 490# No file input but without resume parameters; catch 491# user error to feed us a patch from standard input 492# when there is already $dotest. This is somewhat 493# unreliable -- stdin could be /dev/null for example 494# and the caller did not intend to feed us a patch but 495# wanted to continue unattended. 496test -t0 497;; 498*) 499 false 500;; 501esac|| 502 die "$(eval_gettext "previous rebase directory \$dotest still exists but mbox given.")" 503 resume=yes 504 505case"$skip,$abort"in 506 t,t) 507 die "$(gettext "Please make up your mind. --skip or --abort?")" 508;; 509 t,) 510 git rerere clear 511 head_tree=$(git rev-parse --verify -q HEAD || echo $empty_tree)&& 512 git read-tree --reset -u$head_tree $head_tree&& 513 index_tree=$(git write-tree)&& 514 git read-tree -m -u$index_tree $head_tree 515 git read-tree$head_tree 516;; 517,t) 518iftest -f"$dotest/rebasing" 519then 520exec git rebase --abort 521fi 522 git rerere clear 523if safe_to_abort 524then 525 head_tree=$(git rev-parse --verify -q HEAD || echo $empty_tree)&& 526 git read-tree --reset -u$head_tree $head_tree&& 527 index_tree=$(git write-tree)&& 528 orig_head=$(git rev-parse --verify -q ORIG_HEAD || echo $empty_tree)&& 529 git read-tree -m -u$index_tree $orig_head 530if git rev-parse --verify -q ORIG_HEAD >/dev/null 2>&1 531then 532 git reset ORIG_HEAD 533else 534 git read-tree$empty_tree 535 curr_branch=$(git symbolic-ref HEAD 2>/dev/null)&& 536 git update-ref -d$curr_branch 537fi 538fi 539rm-fr"$dotest" 540exit;; 541esac 542rm-f"$dotest/dirtyindex" 543else 544# Possible stray $dotest directory in the independent-run 545# case; in the --rebasing case, it is upto the caller 546# (git-rebase--am) to take care of stray directories. 547iftest -d"$dotest"&&test -z"$rebasing" 548then 549case"$skip,$resolved,$abort"in 550,,t) 551rm-fr"$dotest" 552exit0 553;; 554*) 555 die "$(eval_gettext "Stray \$dotest directory found. 556Use \"git am --abort\" to remove it.")" 557;; 558esac 559fi 560 561# Make sure we are not given --skip, --continue, or --abort 562test"$skip$resolved$abort"=""|| 563 die "$(gettext "Resolve operation not in progress, we are not resuming.")" 564 565# Start afresh. 566mkdir-p"$dotest"||exit 567 568iftest -n"$prefix"&&test$#!=0 569then 570 first=t 571for arg 572do 573test -n"$first"&& { 574set x 575 first= 576} 577if is_absolute_path "$arg" 578then 579set"$@""$arg" 580else 581set"$@""$prefix$arg" 582fi 583done 584shift 585fi 586 587 check_patch_format "$@" 588 589 split_patches "$@" 590 591# -i can and must be given when resuming; everything 592# else is kept 593echo"$git_apply_opt">"$dotest/apply-opt" 594echo"$threeway">"$dotest/threeway" 595echo"$sign">"$dotest/sign" 596echo"$utf8">"$dotest/utf8" 597echo"$keep">"$dotest/keep" 598echo"$messageid">"$dotest/messageid" 599echo"$scissors">"$dotest/scissors" 600echo"$no_inbody_headers">"$dotest/no_inbody_headers" 601echo"$GIT_QUIET">"$dotest/quiet" 602echo1>"$dotest/next" 603iftest -n"$rebasing" 604then 605: >"$dotest/rebasing" 606else 607: >"$dotest/applying" 608iftest -n"$HAS_HEAD" 609then 610 git update-ref ORIG_HEAD HEAD 611else 612 git update-ref -d ORIG_HEAD >/dev/null 2>&1 613fi 614fi 615fi 616 617git update-index -q --refresh 618 619case"$resolved"in 620'') 621case"$HAS_HEAD"in 622'') 623 files=$(git ls-files);; 624 ?*) 625 files=$(git diff-index --cached --name-only HEAD --);; 626esac||exit 627iftest"$files" 628then 629test -n"$HAS_HEAD"&& : >"$dotest/dirtyindex" 630 die "$(eval_gettext "Dirty index: cannot apply patches (dirty: \$files)")" 631 fi 632esac 633 634# Now, decide what command line options we will give to the git 635# commands we invoke, based on the result of parsing command line 636# options and previous invocation state stored in$dotest/ files. 637 638if test "$(cat "$dotest/utf8")" = t 639then 640 utf8=-u 641else 642 utf8=-n 643fi 644keep=$(cat "$dotest/keep") 645case "$keep" in 646t) 647 keep=-k ;; 648b) 649 keep=-b ;; 650*) 651 keep= ;; 652esac 653case "$(cat "$dotest/messageid")" in 654t) 655 messageid=-m ;; 656f) 657 messageid= ;; 658esac 659case "$(cat "$dotest/scissors")" in 660t) 661 scissors=--scissors ;; 662f) 663 scissors=--no-scissors ;; 664esac 665if test "$(cat "$dotest/no_inbody_headers")" = t 666then 667 no_inbody_headers=--no-inbody-headers 668else 669 no_inbody_headers= 670fi 671if test "$(cat "$dotest/quiet")" = t 672then 673 GIT_QUIET=t 674fi 675if test "$(cat "$dotest/threeway")" = t 676then 677 threeway=t 678fi 679git_apply_opt=$(cat "$dotest/apply-opt") 680if test "$(cat "$dotest/sign")" = t 681then 682 SIGNOFF=$(git var GIT_COMMITTER_IDENT | sed -e ' 683 s/>.*/>/ 684 s/^/Signed-off-by: /' 685 ) 686else 687 SIGNOFF= 688fi 689 690last=$(cat "$dotest/last") 691this=$(cat "$dotest/next") 692if test "$skip" = t 693then 694 this=$(expr "$this" + 1) 695 resume= 696fi 697 698while test "$this" -le "$last" 699do 700 msgnum=$(printf "%0${prec}d" $this) 701 next=$(expr "$this" + 1) 702 test -f "$dotest/$msgnum" || { 703 resume= 704 go_next 705 continue 706 } 707 708 # If we are not resuming, parse and extract the patch information 709 # into separate files: 710 # - info records the authorship and title 711 # - msg is the rest of commit log message 712 # - patch is the patch body. 713 # 714 # When we are resuming, these files are either already prepared 715 # by the user, or the user can tell us to do so by --continue flag. 716 case "$resume" in 717 '') 718 if test -f "$dotest/rebasing" 719 then 720 commit=$(sed -e 's/^From \([0-9a-f]*\).*/\1/' \ 721 -e q "$dotest/$msgnum") && 722 test "$(git cat-file -t "$commit")" = commit || 723 stop_here$this 724 git cat-file commit "$commit" | 725 sed -e '1,/^$/d' >"$dotest/msg-clean" 726 echo "$commit" >"$dotest/original-commit" 727 get_author_ident_from_commit "$commit" >"$dotest/author-script" 728 git diff-tree --root --binary --full-index "$commit" >"$dotest/patch" 729 else 730 git mailinfo$keep$no_inbody_headers$messageid$scissors$utf8"$dotest/msg" "$dotest/patch" \ 731 <"$dotest/$msgnum" >"$dotest/info" || 732 stop_here$this 733 734 # skip pine's internal folder data 735 sane_grep '^Author: Mail System Internal Data$' \ 736 <"$dotest"/info >/dev/null && 737 go_next && continue 738 739 test -s "$dotest/patch" || { 740 eval_gettextln "Patch is empty. Was it split wrong? 741If you would prefer to skip this patch, instead run \"\$cmdline--skip\". 742To restore the original branch and stop patching run \"\$cmdline--abort\"." 743 stop_here$this 744 } 745 rm -f "$dotest/original-commit" "$dotest/author-script" 746 { 747 sed -n '/^Subject/ s/Subject: //p' "$dotest/info" 748 echo 749 cat "$dotest/msg" 750 } | 751 git stripspace > "$dotest/msg-clean" 752 fi 753 ;; 754 esac 755 756 if test -f "$dotest/author-script" 757 then 758 eval$(cat "$dotest/author-script") 759 else 760 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")" 761 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")" 762 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")" 763 fi 764 765 if test -z "$GIT_AUTHOR_EMAIL" 766 then 767 gettextln "Patch does not have a valid e-mail address." 768 stop_here$this 769 fi 770 771 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE 772 773 case "$resume" in 774 '') 775 if test '' != "$SIGNOFF" 776 then 777 LAST_SIGNED_OFF_BY=$( 778 sed -ne '/^Signed-off-by: /p' \ 779 "$dotest/msg-clean" | 780 sed -ne '$p' 781 ) 782 ADD_SIGNOFF=$( 783 test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || { 784 test '' = "$LAST_SIGNED_OFF_BY" && echo 785 echo "$SIGNOFF" 786 }) 787 else 788 ADD_SIGNOFF= 789 fi 790 { 791 if test -s "$dotest/msg-clean" 792 then 793 cat "$dotest/msg-clean" 794 fi 795 if test '' != "$ADD_SIGNOFF" 796 then 797 echo "$ADD_SIGNOFF" 798 fi 799 } >"$dotest/final-commit" 800 ;; 801 *) 802 case "$resolved$interactive" in 803 tt) 804 # This is used only for interactive view option. 805 git diff-index -p --cached HEAD -- >"$dotest/patch" 806 ;; 807 esac 808 esac 809 810 resume= 811 if test "$interactive" = t 812 then 813 test -t 0 || 814 die "$(gettext "cannot be interactive without stdin connected to a terminal.")" 815 action=again 816 while test "$action" = again 817 do 818 gettextln "Commit Body is:" 819 echo "--------------------------" 820 cat "$dotest/final-commit" 821 echo "--------------------------" 822 # TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] 823 # in your translation. The program will only accept English 824 # input at this point. 825 gettext "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " 826 read reply 827 case "$reply" in 828 [yY]*) action=yes ;; 829 [aA]*) action=yes interactive= ;; 830 [nN]*) action=skip ;; 831 [eE]*) git_editor "$dotest/final-commit" 832 action=again ;; 833 [vV]*) action=again 834 git_pager "$dotest/patch" ;; 835 *) action=again ;; 836 esac 837 done 838 else 839 action=yes 840 fi 841 842 if test$action= skip 843 then 844 go_next 845 continue 846 fi 847 848 hook="$(git rev-parse --git-path hooks/applypatch-msg)" 849 if test -x "$hook" 850 then 851 "$hook" "$dotest/final-commit" || stop_here$this 852 fi 853 854 if test -f "$dotest/final-commit" 855 then 856 FIRSTLINE=$(sed 1q "$dotest/final-commit") 857 else 858 FIRSTLINE="" 859 fi 860 861 say "$(eval_gettext "Applying: \$FIRSTLINE")" 862 863 case "$resolved" in 864 '') 865 # When we are allowed to fall back to 3-way later, don't give 866 # false errors during the initial attempt. 867 squelch= 868 if test "$threeway" = t 869 then 870 squelch='>/dev/null 2>&1 ' 871 fi 872 eval "git apply $squelch$git_apply_opt"' --index "$dotest/patch"' 873 apply_status=$? 874 ;; 875 t) 876 # Resolved means the user did all the hard work, and 877 # we do not have to do any patch application. Just 878 # trust what the user has in the index file and the 879 # working tree. 880 resolved= 881 git diff-index --quiet --cached HEAD -- && { 882 gettextln "No changes - did you forget to use 'git add'? 883If there is nothing left to stage, chances are that something else 884already introduced the same changes; you might want to skip this patch." 885 stop_here_user_resolve$this 886 } 887 unmerged=$(git ls-files -u) 888 if test -n "$unmerged" 889 then 890 gettextln "You still have unmerged paths in your index 891did you forget to use 'git add'?" 892 stop_here_user_resolve$this 893 fi 894 apply_status=0 895 git rerere 896 ;; 897 esac 898 899 if test$apply_status!= 0 && test "$threeway" = t 900 then 901 if (fall_back_3way) 902 then 903 # Applying the patch to an earlier tree and merging the 904 # result may have produced the same tree as ours. 905 git diff-index --quiet --cached HEAD -- && { 906 say "$(gettext "No changes -- Patch already applied.")" 907 go_next 908 continue 909 } 910 # clear apply_status -- we have successfully merged. 911 apply_status=0 912 fi 913 fi 914 if test$apply_status!= 0 915 then 916 eval_gettextln 'Patch failed at$msgnum$FIRSTLINE' 917 if test "$(git config --bool advice.amworkdir)" != false 918 then 919 eval_gettextln 'The copy of the patch that failed is found in: 920$dotest/patch' 921 fi 922 stop_here_user_resolve$this 923 fi 924 925 hook="$(git rev-parse --git-path hooks/pre-applypatch)" 926 if test -x "$hook" 927 then 928 "$hook" || stop_here$this 929 fi 930 931 tree=$(git write-tree)&& 932 commit=$( 933 if test -n "$ignore_date" 934 then 935 GIT_AUTHOR_DATE= 936 fi 937 parent=$(git rev-parse --verify -q HEAD)|| 938 say >&2 "$(gettext "applying to an empty history")" 939 940 if test -n "$committer_date_is_author_date" 941 then 942 GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" 943 export GIT_COMMITTER_DATE 944 fi && 945 git commit-tree${parent:+-p}$parent${gpg_sign_opt:+"$gpg_sign_opt"}$tree\ 946 <"$dotest/final-commit" 947 ) && 948 git update-ref -m "$GIT_REFLOG_ACTION:$FIRSTLINE" HEAD$commit$parent|| 949 stop_here$this 950 951 if test -f "$dotest/original-commit"; then 952 echo "$(cat "$dotest/original-commit") $commit" >> "$dotest/rewritten" 953 fi 954 955 hook="$(git rev-parse --git-path hooks/post-applypatch)" 956 test -x "$hook" && "$hook" 957 958 go_next 959done 960 961if test -s "$dotest"/rewritten; then 962 git notes copy --for-rewrite=rebase < "$dotest"/rewritten 963 hook="$(git rev-parse --git-path hooks/post-rewrite)" 964 if test -x "$hook"; then 965 "$hook" rebase < "$dotest"/rewritten 966 fi 967fi 968 969# If am was called with --rebasing (from git-rebase--am), it's up to 970# the caller to take care of housekeeping. 971if ! test -f "$dotest/rebasing" 972then 973 rm -fr "$dotest" 974 git gc --auto 975fi