@ -107,7 +107,7 @@ It does not apply to blobs recorded in its index."
# patch did not touch, so recursive ends up canceling them,
# patch did not touch, so recursive ends up canceling them,
# saying that we reverted all those changes.
# saying that we reverted all those changes.
eval GITHEAD_$his_tree='"$SUBJECT"'
eval GITHEAD_$his_tree='"$FIRSTLINE"'
export GITHEAD_$his_tree
export GITHEAD_$his_tree
git-merge-recursive $orig_tree -- HEAD $his_tree || {
git-merge-recursive $orig_tree -- HEAD $his_tree || {
git rerere
git rerere
@ -117,10 +117,6 @@ It does not apply to blobs recorded in its index."
unset GITHEAD_$his_tree
unset GITHEAD_$his_tree
}
}
reread_subject () {
git stripspace <"$1" | sed -e 1q
}
prec=4
prec=4
dotest=".dotest"
dotest=".dotest"
sign= utf8=t keep= skip= interactive= resolved= binary= rebasing=
sign= utf8=t keep= skip= interactive= resolved= binary= rebasing=
@ -331,7 +327,11 @@ do
echo "Patch is empty. Was it split wrong?"
echo "Patch is empty. Was it split wrong?"
stop_here $this
stop_here $this
}
}
git stripspace < "$dotest/msg" > "$dotest/msg-clean"
SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac
(echo "$SUBJECT" ; echo ; cat "$dotest/msg") |
git stripspace > "$dotest/msg-clean"
;;
;;
esac
esac
@ -347,9 +347,6 @@ do
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
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
case "$resume" in
'')
'')
if test '' != "$SIGNOFF"
if test '' != "$SIGNOFF"
@ -368,10 +365,8 @@ do
ADD_SIGNOFF=
ADD_SIGNOFF=
fi
fi
{
{
printf '%s\n' "$SUBJECT"
if test -s "$dotest/msg-clean"
if test -s "$dotest/msg-clean"
then
then
echo
cat "$dotest/msg-clean"
cat "$dotest/msg-clean"
fi
fi
if test '' != "$ADD_SIGNOFF"
if test '' != "$ADD_SIGNOFF"
@ -388,6 +383,7 @@ do
;;
;;
esac
esac
esac
esac
FIRSTLINE=$(head -1 "$dotest/final-commit")
resume=
resume=
if test "$interactive" = t
if test "$interactive" = t
@ -408,7 +404,7 @@ do
[aA]*) action=yes interactive= ;;
[aA]*) action=yes interactive= ;;
[nN]*) action=skip ;;
[nN]*) action=skip ;;
[eE]*) git_editor "$dotest/final-commit"
[eE]*) git_editor "$dotest/final-commit"
SUBJECT=$(reread_subject "$dotest/final-commit")
FIRSTLINE=$(head -1 "$dotest/final-commit")
action=again ;;
action=again ;;
[vV]*) action=again
[vV]*) action=again
LESS=-S ${PAGER:-less} "$dotest/patch" ;;
LESS=-S ${PAGER:-less} "$dotest/patch" ;;
@ -431,7 +427,7 @@ do
stop_here $this
stop_here $this
fi
fi
printf 'Applying %s\n' "$SUBJECT"
printf 'Applying %s\n' "$FIRSTLINE"
case "$resolved" in
case "$resolved" in
'')
'')
@ -489,7 +485,7 @@ do
tree=$(git write-tree) &&
tree=$(git write-tree) &&
parent=$(git rev-parse --verify HEAD) &&
parent=$(git rev-parse --verify HEAD) &&
commit=$(git commit-tree $tree -p $parent <"$dotest/final-commit") &&
commit=$(git commit-tree $tree -p $parent <"$dotest/final-commit") &&
git update-ref -m "$GIT_REFLOG_ACTION: $SUBJECT" HEAD $commit $parent ||
git update-ref -m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD $commit $parent ||
stop_here $this
stop_here $this
if test -x "$GIT_DIR"/hooks/post-applypatch
if test -x "$GIT_DIR"/hooks/post-applypatch