[thirdparty/git.git] / git-am.sh

#!/bin/sh
#
# Copyright (c) 2005, 2006 Junio C Hamano

USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
  [--interactive] [--whitespace=<option>] <mbox>...
  or, when resuming [--skip | --resolved]'
. git-sh-setup

git var GIT_COMMITTER_IDENT >/dev/null || exit

stop_here () {
    echo "$1" >"$dotest/next"
    exit 1
}

stop_here_user_resolve () {
    if [ -n "$resolvemsg" ]; then
	    echo "$resolvemsg"
	    stop_here $1
    fi
    cmdline=$(basename $0)
    if test '' != "$interactive"
    then
        cmdline="$cmdline -i"
    fi
    if test '' != "$threeway"
    then
        cmdline="$cmdline -3"
    fi
    if test '.dotest' != "$dotest"
    then
        cmdline="$cmdline -d=$dotest"
    fi
    echo "When you have resolved this problem run \"$cmdline --resolved\"."
    echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."

    stop_here $1
}

go_next () {
	rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
		"$dotest/patch" "$dotest/info"
	echo "$next" >"$dotest/next"
	this=$next
}

cannot_fallback () {
	echo "$1"
	echo "Cannot fall back to three-way merge."
	exit 1
}

fall_back_3way () {
    O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd`

    rm -fr "$dotest"/patch-merge-*
    mkdir "$dotest/patch-merge-tmp-dir"

    # First see if the patch records the index info that we can use.
    git-apply -z --index-info "$dotest/patch" \
	>"$dotest/patch-merge-index-info" &&
    GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
    git-update-index -z --index-info <"$dotest/patch-merge-index-info" &&
    GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
    git-write-tree >"$dotest/patch-merge-base+" ||
    cannot_fallback "Patch does not record usable index information."

    echo Using index info to reconstruct a base tree...
    if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
	git-apply $binary --cached <"$dotest/patch"
    then
	mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
	mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
    else
        cannot_fallback "Did you hand edit your patch?
It does not apply to blobs recorded in its index."
    fi

    test -f "$dotest/patch-merge-index" &&
    his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git-write-tree) &&
    orig_tree=$(cat "$dotest/patch-merge-base") &&
    rm -fr "$dotest"/patch-merge-* || exit 1

    echo Falling back to patching base and 3-way merge...

    # This is not so wrong.  Depending on which base we picked,
    # orig_tree may be wildly different from ours, but his_tree
    # has the same set of wildly different changes in parts the
    # patch did not touch, so resolve ends up canceling them,
    # saying that we reverted all those changes.

    git-merge-resolve $orig_tree -- HEAD $his_tree || {
	    if test -d "$GIT_DIR/rr-cache"
	    then
		git-rerere
	    fi
	    echo Failed to merge in the changes.
	    exit 1
    }
}

prec=4
rloga=am
dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary= ws= resolvemsg=

while case "$#" in 0) break;; esac
do
	case "$1" in
	-d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*)
	dotest=`expr "z$1" : 'z-[^=]*=\(.*\)'`; shift ;;
	-d|--d|--do|--dot|--dote|--dotes|--dotest)
	case "$#" in 1) usage ;; esac; shift
	dotest="$1"; shift;;

	-i|--i|--in|--int|--inte|--inter|--intera|--interac|--interact|\
	--interacti|--interactiv|--interactive)
	interactive=t; shift ;;

	-b|--b|--bi|--bin|--bina|--binar|--binary)
	binary=t; shift ;;

	-3|--3|--3w|--3wa|--3way)
	threeway=t; shift ;;
	-s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
	sign=t; shift ;;
	-u|--u|--ut|--utf|--utf8)
	utf8=t; shift ;;
	-k|--k|--ke|--kee|--keep)
	keep=t; shift ;;

	-r|--r|--re|--res|--reso|--resol|--resolv|--resolve|--resolved)
	resolved=t; shift ;;

	--sk|--ski|--skip)
	skip=t; shift ;;

	--whitespace=*)
	ws=$1; shift ;;

	--resolvemsg=*)
	resolvemsg=$(echo "$1" | sed -e "s/^--resolvemsg=//"); shift ;;

	--reflog-action=*)
	rloga=`expr "z$1" : 'z-[^=]*=\(.*\)'`; shift ;;

	--)
	shift; break ;;
	-*)
	usage ;;
	*)
	break ;;
	esac
done

# If the dotest directory exists, but we have finished applying all the
# patches in them, clear it out.
if test -d "$dotest" &&
   last=$(cat "$dotest/last") &&
   next=$(cat "$dotest/next") &&
   test $# != 0 &&
   test "$next" -gt "$last"
then
   rm -fr "$dotest"
fi

if test -d "$dotest"
then
	if test ",$#," != ",0," || ! tty -s
	then
		die "previous dotest directory $dotest still exists but mbox given."
	fi
	resume=yes
else
	# Make sure we are not given --skip nor --resolved
	test ",$skip,$resolved," = ,,, ||
		die "Resolve operation not in progress, we are not resuming."

	# Start afresh.
	mkdir -p "$dotest" || exit

	git-mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" ||  {
		rm -fr "$dotest"
		exit 1
	}

	# -b, -s, -u, -k and --whitespace flags are kept for the
	# resuming session after a patch failure.
	# -3 and -i can and must be given when resuming.
	echo "$binary" >"$dotest/binary"
	echo " $ws" >"$dotest/whitespace"
	echo "$sign" >"$dotest/sign"
	echo "$utf8" >"$dotest/utf8"
	echo "$keep" >"$dotest/keep"
	echo 1 >"$dotest/next"
fi

case "$resolved" in
'')
	files=$(git-diff-index --cached --name-only HEAD) || exit
	if [ "$files" ]; then
	   echo "Dirty index: cannot apply patches (dirty: $files)" >&2
	   exit 1
	fi
esac

if test "$(cat "$dotest/binary")" = t
then
	binary=--allow-binary-replacement
fi
if test "$(cat "$dotest/utf8")" = t
then
	utf8=-u
fi
if test "$(cat "$dotest/keep")" = t
then
	keep=-k
fi
ws=`cat "$dotest/whitespace"`
if test "$(cat "$dotest/sign")" = t
then
	SIGNOFF=`git-var GIT_COMMITTER_IDENT | sed -e '
			s/>.*/>/
			s/^/Signed-off-by: /'
		`
else
	SIGNOFF=
fi

last=`cat "$dotest/last"`
this=`cat "$dotest/next"`
if test "$skip" = t
then
	this=`expr "$this" + 1`
	resume=
fi

if test "$this" -gt "$last"
then
	echo Nothing to do.
	rm -fr "$dotest"
	exit
fi

while test "$this" -le "$last"
do
	msgnum=`printf "%0${prec}d" $this`
	next=`expr "$this" + 1`
	test -f "$dotest/$msgnum" || {
		resume=
		go_next
		continue
	}

	# If we are not resuming, parse and extract the patch information
	# into separate files:
	#  - info records the authorship and title
	#  - msg is the rest of commit log message
	#  - patch is the patch body.
	#
	# When we are resuming, these files are either already prepared
	# by the user, or the user can tell us to do so by --resolved flag.
	case "$resume" in
	'')
		git-mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \
			<"$dotest/$msgnum" >"$dotest/info" ||
			stop_here $this
		git-stripspace < "$dotest/msg" > "$dotest/msg-clean"
		;;
	esac

	GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
	GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
	GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"

	if test -z "$GIT_AUTHOR_EMAIL"
	then
		echo "Patch does not have a valid e-mail address."
		stop_here $this
	fi

	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE

	SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
	case "$keep_subject" in -k)  SUBJECT="[PATCH] $SUBJECT" ;; esac

	case "$resume" in
	'')
	    if test '' != "$SIGNOFF"
	    then
		LAST_SIGNED_OFF_BY=`
		    sed -ne '/^Signed-off-by: /p' \
		    "$dotest/msg-clean" |
		    tail -n 1
		`
		ADD_SIGNOFF=`
		    test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
		    test '' = "$LAST_SIGNED_OFF_BY" && echo
		    echo "$SIGNOFF"
		}`
	    else
		ADD_SIGNOFF=
	    fi
	    {
		echo "$SUBJECT"
		if test -s "$dotest/msg-clean"
		then
			echo
			cat "$dotest/msg-clean"
		fi
		if test '' != "$ADD_SIGNOFF"
		then
			echo "$ADD_SIGNOFF"
		fi
	    } >"$dotest/final-commit"
	    ;;
	*)
		case "$resolved$interactive" in
		tt)
			# This is used only for interactive view option.
			git-diff-index -p --cached HEAD >"$dotest/patch"
			;;
		esac
	esac

	resume=
	if test "$interactive" = t
	then
	    test -t 0 ||
	    die "cannot be interactive without stdin connected to a terminal."
	    action=again
	    while test "$action" = again
	    do
		echo "Commit Body is:"
		echo "--------------------------"
		cat "$dotest/final-commit"
		echo "--------------------------"
		printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
		read reply
		case "$reply" in
		[yY]*) action=yes ;;
		[aA]*) action=yes interactive= ;;
		[nN]*) action=skip ;;
		[eE]*) "${VISUAL:-${EDITOR:-vi}}" "$dotest/final-commit"
		       action=again ;;
		[vV]*) action=again
		       LESS=-S ${PAGER:-less} "$dotest/patch" ;;
		*)     action=again ;;
		esac
	    done
	else
	    action=yes
	fi

	if test $action = skip
	then
		go_next
		continue
	fi

	if test -x "$GIT_DIR"/hooks/applypatch-msg
	then
		"$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" ||
		stop_here $this
	fi

	echo
	echo "Applying '$SUBJECT'"
	echo

	case "$resolved" in
	'')
		git-apply $binary --index $ws "$dotest/patch"
		apply_status=$?
		;;
	t)
		# Resolved means the user did all the hard work, and
		# we do not have to do any patch application.  Just
		# trust what the user has in the index file and the
		# working tree.
		resolved=
		changed="$(git-diff-index --cached --name-only HEAD)"
		if test '' = "$changed"
		then
			echo "No changes - did you forget update-index?"
			stop_here_user_resolve $this
		fi
		unmerged=$(git-ls-files -u)
		if test -n "$unmerged"
		then
			echo "You still have unmerged paths in your index"
			echo "did you forget update-index?"
			stop_here_user_resolve $this
		fi
		apply_status=0
		;;
	esac

	if test $apply_status = 1 && test "$threeway" = t
	then
		if (fall_back_3way)
		then
		    # Applying the patch to an earlier tree and merging the
		    # result may have produced the same tree as ours.
		    changed="$(git-diff-index --cached --name-only HEAD)"
		    if test '' = "$changed"
		    then
			    echo No changes -- Patch already applied.
			    go_next
			    continue
		    fi
		    # clear apply_status -- we have successfully merged.
		    apply_status=0
		fi
	fi
	if test $apply_status != 0
	then
		echo Patch failed at $msgnum.
		stop_here_user_resolve $this
	fi

	if test -x "$GIT_DIR"/hooks/pre-applypatch
	then
		"$GIT_DIR"/hooks/pre-applypatch || stop_here $this
	fi

	tree=$(git-write-tree) &&
	echo Wrote tree $tree &&
	parent=$(git-rev-parse --verify HEAD) &&
	commit=$(git-commit-tree $tree -p $parent <"$dotest/final-commit") &&
	echo Committed: $commit &&
	git-update-ref -m "$rloga: $SUBJECT" HEAD $commit $parent ||
	stop_here $this

	if test -x "$GIT_DIR"/hooks/post-applypatch
	then
		"$GIT_DIR"/hooks/post-applypatch
	fi

	go_next
done

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