1#!/bin/sh 2# 3# Copyright (c) 2005, 2006 Junio C Hamano 4 5SUBDIRECTORY_OK=Yes 6OPTIONS_KEEPDASHDASH= 7OPTIONS_SPEC="\ 8git-am [options] <mbox>|<Maildir>... 9git-am [options] --resolved 10git-am [options] --skip 11-- 12d,dotest= (removed -- do not use) 13i,interactive run interactively 14b,binary pass --allow-binary-replacement to git-apply 153,3way allow fall back on 3way merging if needed 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 19whitespace= pass it through git-apply 20C= pass it through git-apply 21p= pass it through git-apply 22resolvemsg= override error message when patch failure occurs 23r,resolved to be used after a patch failure 24skip skip the current patch 25rebasing (internal use for git-rebase)" 26 27. git-sh-setup 28prefix=$(git rev-parse --show-prefix) 29set_reflog_action am 30require_work_tree 31cd_to_toplevel 32 33git var GIT_COMMITTER_IDENT >/dev/null ||exit 34 35stop_here () { 36echo"$1">"$dotest/next" 37exit1 38} 39 40stop_here_user_resolve () { 41if[-n"$resolvemsg"];then 42printf'%s\n'"$resolvemsg" 43 stop_here $1 44fi 45 cmdline=$(basename $0) 46iftest''!="$interactive" 47then 48 cmdline="$cmdline-i" 49fi 50iftest''!="$threeway" 51then 52 cmdline="$cmdline-3" 53fi 54echo"When you have resolved this problem run\"$cmdline--resolved\"." 55echo"If you would prefer to skip this patch, instead run\"$cmdline--skip\"." 56 57 stop_here $1 58} 59 60go_next () { 61rm-f"$dotest/$msgnum""$dotest/msg""$dotest/msg-clean" \ 62"$dotest/patch""$dotest/info" 63echo"$next">"$dotest/next" 64 this=$next 65} 66 67cannot_fallback () { 68echo"$1" 69echo"Cannot fall back to three-way merge." 70exit1 71} 72 73fall_back_3way () { 74 O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd` 75 76rm-fr"$dotest"/patch-merge-* 77mkdir"$dotest/patch-merge-tmp-dir" 78 79# First see if the patch records the index info that we can use. 80 git apply --build-fake-ancestor"$dotest/patch-merge-tmp-index" \ 81"$dotest/patch"&& 82 GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ 83 git write-tree>"$dotest/patch-merge-base+"|| 84 cannot_fallback "Repository lacks necessary blobs to fall back on 3-way merge." 85 86echo Using index info to reconstruct a base tree... 87if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ 88 git apply $binary--cached<"$dotest/patch" 89then 90mv"$dotest/patch-merge-base+""$dotest/patch-merge-base" 91mv"$dotest/patch-merge-tmp-index""$dotest/patch-merge-index" 92else 93 cannot_fallback "Did you hand edit your patch? 94It does not apply to blobs recorded in its index." 95fi 96 97test -f"$dotest/patch-merge-index"&& 98 his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git write-tree)&& 99 orig_tree=$(cat "$dotest/patch-merge-base")&& 100rm-fr"$dotest"/patch-merge-* ||exit1 101 102echo Falling back to patching base and 3-way merge... 103 104# This is not so wrong. Depending on which base we picked, 105# orig_tree may be wildly different from ours, but his_tree 106# has the same set of wildly different changes in parts the 107# patch did not touch, so recursive ends up canceling them, 108# saying that we reverted all those changes. 109 110eval GITHEAD_$his_tree='"$FIRSTLINE"' 111export GITHEAD_$his_tree 112 git-merge-recursive$orig_tree-- HEAD $his_tree|| { 113 git rerere 114echo Failed to merge in the changes. 115exit1 116} 117unset GITHEAD_$his_tree 118} 119 120prec=4 121dotest=".dotest" 122sign= utf8=t keep= skip= interactive= resolved= binary= rebasing= 123resolvemsg= resume= 124git_apply_opt= 125 126whiletest$#!=0 127do 128case"$1"in 129-i|--interactive) 130 interactive=t ;; 131-b|--binary) 132 binary=t ;; 133-3|--3way) 134 threeway=t ;; 135-s|--signoff) 136 sign=t ;; 137-u|--utf8) 138 utf8=t ;;# this is now default 139--no-utf8) 140 utf8= ;; 141-k|--keep) 142 keep=t ;; 143-r|--resolved) 144 resolved=t ;; 145--skip) 146 skip=t ;; 147--rebasing) 148 rebasing=t threeway=t keep=t binary=t ;; 149-d|--dotest) 150 die "-d option is no longer supported. Do not use." 151;; 152--resolvemsg) 153shift; resolvemsg=$1;; 154--whitespace) 155 git_apply_opt="$git_apply_opt$1=$2";shift;; 156-C|-p) 157 git_apply_opt="$git_apply_opt$1$2";shift;; 158--) 159shift;break;; 160*) 161 usage ;; 162esac 163shift 164done 165 166# If the dotest directory exists, but we have finished applying all the 167# patches in them, clear it out. 168iftest -d"$dotest"&& 169 last=$(cat "$dotest/last")&& 170 next=$(cat "$dotest/next")&& 171test$#!=0&& 172test"$next"-gt"$last" 173then 174rm-fr"$dotest" 175fi 176 177iftest -d"$dotest" 178then 179case"$#,$skip$resolved"in 1800,*t*) 181# Explicit resume command and we do not have file, so 182# we are happy. 183: ;; 1840,) 185# No file input but without resume parameters; catch 186# user error to feed us a patch from standard input 187# when there is already $dotest. This is somewhat 188# unreliable -- stdin could be /dev/null for example 189# and the caller did not intend to feed us a patch but 190# wanted to continue unattended. 191 tty -s 192;; 193*) 194 false 195;; 196esac|| 197 die "previous dotest directory$doteststill exists but mbox given." 198 resume=yes 199else 200# Make sure we are not given --skip nor --resolved 201test",$skip,$resolved,"= ,,, || 202 die "Resolve operation not in progress, we are not resuming." 203 204# Start afresh. 205mkdir-p"$dotest"||exit 206 207iftest -n"$prefix"&&test$#!=0 208then 209 first=t 210for arg 211do 212test -n"$first"&& { 213set x 214 first= 215} 216case"$arg"in 217/*) 218set"$@""$arg";; 219*) 220set"$@""$prefix$arg";; 221esac 222done 223shift 224fi 225 git mailsplit -d"$prec"-o"$dotest"-b --"$@">"$dotest/last"|| { 226rm-fr"$dotest" 227exit1 228} 229 230# -b, -s, -u, -k and --whitespace flags are kept for the 231# resuming session after a patch failure. 232# -3 and -i can and must be given when resuming. 233echo"$binary">"$dotest/binary" 234echo"$ws">"$dotest/whitespace" 235echo"$sign">"$dotest/sign" 236echo"$utf8">"$dotest/utf8" 237echo"$keep">"$dotest/keep" 238echo1>"$dotest/next" 239iftest -n"$rebasing" 240then 241: >"$dotest/rebasing" 242else 243: >"$dotest/applying" 244 git update-ref ORIG_HEAD HEAD 245fi 246fi 247 248case"$resolved"in 249'') 250 files=$(git diff-index --cached --name-only HEAD --)||exit 251if["$files"];then 252echo"Dirty index: cannot apply patches (dirty:$files)">&2 253exit1 254fi 255esac 256 257iftest"$(cat "$dotest/binary")"= t 258then 259 binary=--allow-binary-replacement 260fi 261iftest"$(cat "$dotest/utf8")"= t 262then 263 utf8=-u 264else 265 utf8=-n 266fi 267iftest"$(cat "$dotest/keep")"= t 268then 269 keep=-k 270fi 271ws=`cat "$dotest/whitespace"` 272iftest"$(cat "$dotest/sign")"= t 273then 274 SIGNOFF=`git-var GIT_COMMITTER_IDENT | sed -e ' 275 s/>.*/>/ 276 s/^/Signed-off-by: /' 277 ` 278else 279 SIGNOFF= 280fi 281 282last=`cat "$dotest/last"` 283this=`cat "$dotest/next"` 284iftest"$skip"= t 285then 286 git rerere clear 287 this=`expr "$this" + 1` 288 resume= 289fi 290 291iftest"$this"-gt"$last" 292then 293echo Nothing to do. 294rm-fr"$dotest" 295exit 296fi 297 298whiletest"$this"-le"$last" 299do 300 msgnum=`printf "%0${prec}d"$this` 301 next=`expr "$this" + 1` 302test -f"$dotest/$msgnum"|| { 303 resume= 304 go_next 305continue 306} 307 308# If we are not resuming, parse and extract the patch information 309# into separate files: 310# - info records the authorship and title 311# - msg is the rest of commit log message 312# - patch is the patch body. 313# 314# When we are resuming, these files are either already prepared 315# by the user, or the user can tell us to do so by --resolved flag. 316case"$resume"in 317'') 318 git mailinfo $keep $utf8"$dotest/msg""$dotest/patch" \ 319<"$dotest/$msgnum">"$dotest/info"|| 320 stop_here $this 321 322# skip pine's internal folder data 323grep'^Author: Mail System Internal Data$' \ 324<"$dotest"/info >/dev/null && 325 go_next &&continue 326 327test -s$dotest/patch|| { 328echo"Patch is empty. Was it split wrong?" 329 stop_here $this 330} 331iftest -f"$dotest/rebasing"&& 332 commit=$(sed -e 's/^From \([0-9a-f]*\) .*/\1/' \ 333 -e q "$dotest/$msgnum") && 334 test "$(git cat-file -t "$commit")" = commit 335 then 336 git cat-file commit "$commit" | 337 sed -e '1,/^$/d' >"$dotest/msg-clean" 338 else 339 SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")" 340 case "$keep_subject" in -k) SUBJECT="[PATCH]$SUBJECT" ;; esac 341 342 (printf '%s\n\n' "$SUBJECT"; cat "$dotest/msg") | 343 git stripspace > "$dotest/msg-clean" 344 fi 345 ;; 346 esac 347 348 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")" 349 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")" 350 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")" 351 352 if test -z "$GIT_AUTHOR_EMAIL" 353 then 354 echo "Patch does not have a valid e-mail address." 355 stop_here$this 356 fi 357 358 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE 359 360 case "$resume" in 361 '') 362 if test '' != "$SIGNOFF" 363 then 364 LAST_SIGNED_OFF_BY=` 365 sed -ne '/^Signed-off-by: /p' \ 366 "$dotest/msg-clean" | 367 sed -ne '$p' 368 ` 369 ADD_SIGNOFF=` 370 test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || { 371 test '' = "$LAST_SIGNED_OFF_BY" && echo 372 echo "$SIGNOFF" 373 }` 374 else 375 ADD_SIGNOFF= 376 fi 377 { 378 if test -s "$dotest/msg-clean" 379 then 380 cat "$dotest/msg-clean" 381 fi 382 if test '' != "$ADD_SIGNOFF" 383 then 384 echo "$ADD_SIGNOFF" 385 fi 386 } >"$dotest/final-commit" 387 ;; 388 *) 389 case "$resolved$interactive" in 390 tt) 391 # This is used only for interactive view option. 392 git diff-index -p --cached HEAD -- >"$dotest/patch" 393 ;; 394 esac 395 esac 396 397 resume= 398 if test "$interactive" = t 399 then 400 test -t 0 || 401 die "cannot be interactive without stdin connected to a terminal." 402 action=again 403 while test "$action" = again 404 do 405 echo "Commit Body is:" 406 echo "--------------------------" 407 cat "$dotest/final-commit" 408 echo "--------------------------" 409 printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " 410 read reply 411 case "$reply" in 412 [yY]*) action=yes ;; 413 [aA]*) action=yes interactive= ;; 414 [nN]*) action=skip ;; 415 [eE]*) git_editor "$dotest/final-commit" 416 action=again ;; 417 [vV]*) action=again 418 LESS=-S${PAGER:-less}"$dotest/patch" ;; 419 *) action=again ;; 420 esac 421 done 422 else 423 action=yes 424 fi 425 FIRSTLINE=$(sed 1q "$dotest/final-commit") 426 427 if test$action= skip 428 then 429 go_next 430 continue 431 fi 432 433 if test -x "$GIT_DIR"/hooks/applypatch-msg 434 then 435 "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" || 436 stop_here$this 437 fi 438 439 printf 'Applying %s\n' "$FIRSTLINE" 440 441 case "$resolved" in 442 '') 443 git apply$git_apply_opt$binary--index "$dotest/patch" 444 apply_status=$? 445 ;; 446 t) 447 # Resolved means the user did all the hard work, and 448 # we do not have to do any patch application. Just 449 # trust what the user has in the index file and the 450 # working tree. 451 resolved= 452 git diff-index --quiet --cached HEAD -- && { 453 echo "No changes - did you forget to use 'git add'?" 454 stop_here_user_resolve$this 455 } 456 unmerged=$(git ls-files -u) 457 if test -n "$unmerged" 458 then 459 echo "You still have unmerged paths in your index" 460 echo "did you forget to use 'git add'?" 461 stop_here_user_resolve$this 462 fi 463 apply_status=0 464 git rerere 465 ;; 466 esac 467 468 if test$apply_status= 1 && test "$threeway" = t 469 then 470 if (fall_back_3way) 471 then 472 # Applying the patch to an earlier tree and merging the 473 # result may have produced the same tree as ours. 474 git diff-index --quiet --cached HEAD -- && { 475 echo No changes -- Patch already applied. 476 go_next 477 continue 478 } 479 # clear apply_status -- we have successfully merged. 480 apply_status=0 481 fi 482 fi 483 if test$apply_status!= 0 484 then 485 echo Patch failed at$msgnum. 486 stop_here_user_resolve$this 487 fi 488 489 if test -x "$GIT_DIR"/hooks/pre-applypatch 490 then 491 "$GIT_DIR"/hooks/pre-applypatch || stop_here$this 492 fi 493 494 tree=$(git write-tree)&& 495 parent=$(git rev-parse --verify HEAD)&& 496 commit=$(git commit-tree $tree -p $parent <"$dotest/final-commit")&& 497 git update-ref -m "$GIT_REFLOG_ACTION:$FIRSTLINE" HEAD$commit$parent|| 498 stop_here$this 499 500 if test -x "$GIT_DIR"/hooks/post-applypatch 501 then 502 "$GIT_DIR"/hooks/post-applypatch 503 fi 504 505 go_next 506done 507 508git gc --auto 509 510rm -fr "$dotest"