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

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

OPTIONS_KEEPDASHDASH=
OPTIONS_SPEC="\
git-am [options] <mbox>|<Maildir>...
git-am [options] --resolved
git-am [options] --skip
--
d,dotest=       use <dir> and not .dotest
i,interactive   run interactively
b,binary        pass --allo-binary-replacement to git-apply
3,3way          allow fall back on 3way merging if needed
s,signoff       add a Signed-off-by line to the commit message
u,utf8          recode into utf8 (default)
k,keep          pass -k flagg to git-mailinfo
whitespace=     pass it through git-apply
C=              pass it through git-apply
p=              pass it through git-apply
resolvemsg=     override error message when patch failure occurs
r,resolved      to be used after a patch failure
skip            skip the current patch"

. git-sh-setup
set_reflog_action am
require_work_tree

git var GIT_COMMITTER_IDENT >/dev/null || exit

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

stop_here_user_resolve () {
    if [ -n "$resolvemsg" ]; then
	    printf '%s\n' "$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 --build-fake-ancestor "$dotest/patch-merge-tmp-index" \
	"$dotest/patch" &&
    GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
    git write-tree >"$dotest/patch-merge-base+" ||
    cannot_fallback "Repository lacks necessary blobs to fall back on 3-way merge."

    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 recursive ends up canceling them,
    # saying that we reverted all those changes.

    eval GITHEAD_$his_tree='"$SUBJECT"'
    export GITHEAD_$his_tree
    git-merge-recursive $orig_tree -- HEAD $his_tree || {
	    git rerere
	    echo Failed to merge in the changes.
	    exit 1
    }
    unset GITHEAD_$his_tree
}

prec=4
dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary=
resolvemsg= resume=
git_apply_opt=

while test $# != 0
do
	case "$1" in
	-i|--interactive)
		interactive=t ;;
	-b|--binary)
		binary=t ;;
	-3|--3way)
		threeway=t ;;
	-s|--signoff)
		sign=t ;;
	-u|--utf8)
		utf8=t ;; # this is now default
	--no-utf8)
		utf8= ;;
	-k|--keep)
		keep=t ;;
	-r|--resolved)
		resolved=t ;;
	--skip)
		skip=t ;;
	-d|--dotest)
		shift; dotest=$1;;
	--resolvemsg)
		shift; resolvemsg=$1 ;;
	--whitespace)
		git_apply_opt="$git_apply_opt $1=$2"; shift ;;
	-C|-p)
		git_apply_opt="$git_apply_opt $1$2"; shift ;;
	--)
		shift; break ;;
	*)
		usage ;;
	esac
	shift
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
	case "$#,$skip$resolved" in
	0,*t*)
		# Explicit resume command and we do not have file, so
		# we are happy.
		: ;;
	0,)
		# No file input but without resume parameters; catch
		# user error to feed us a patch from standard input
		# when there is already .dotest.  This is somewhat
		# unreliable -- stdin could be /dev/null for example
		# and the caller did not intend to feed us a patch but
		# wanted to continue unattended.
		tty -s
		;;
	*)
		false
		;;
	esac ||
	die "previous dotest directory $dotest still exists but mbox given."
	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
else
	utf8=-n
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
	git rerere clear
	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

		# skip pine's internal folder data
		grep '^Author: Mail System Internal Data$' \
			<"$dotest"/info >/dev/null &&
			go_next && continue

		test -s $dotest/patch || {
			echo "Patch is empty.  Was it split wrong?"
			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" || test -z "$GIT_AUTHOR_DATE"
	then
		echo "Patch does not have valid authorship information."
		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
	    {
		printf '%s\n' "$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]*) git_editor "$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

	printf 'Applying %s\n' "$SUBJECT"

	case "$resolved" in
	'')
		git apply $git_apply_opt $binary --index "$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=
		git diff-index --quiet --cached HEAD -- && {
			echo "No changes - did you forget to use 'git add'?"
			stop_here_user_resolve $this
		}
		unmerged=$(git ls-files -u)
		if test -n "$unmerged"
		then
			echo "You still have unmerged paths in your index"
			echo "did you forget to use 'git add'?"
			stop_here_user_resolve $this
		fi
		apply_status=0
		git rerere
		;;
	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.
		    git diff-index --quiet --cached HEAD -- && {
			echo No changes -- Patch already applied.
			go_next
			continue
		    }
		    # 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) &&
	parent=$(git rev-parse --verify HEAD) &&
	commit=$(git commit-tree $tree -p $parent <"$dotest/final-commit") &&
	git update-ref -m "$GIT_REFLOG_ACTION: $SUBJECT" HEAD $commit $parent ||
	stop_here $this

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

	git gc --auto

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