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