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