зеркало из https://github.com/microsoft/git.git
Merge branch 'jc/maint-am-keep'
This commit is contained in:
Коммит
5e2f779cbf
|
@ -577,10 +577,11 @@ do
|
|||
git cat-file commit "$commit" |
|
||||
sed -e '1,/^$/d' >"$dotest/msg-clean"
|
||||
else
|
||||
SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
|
||||
case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac
|
||||
|
||||
(printf '%s\n\n' "$SUBJECT"; cat "$dotest/msg") |
|
||||
{
|
||||
sed -n '/^Subject/ s/Subject: //p' "$dotest/info"
|
||||
echo
|
||||
cat "$dotest/msg"
|
||||
} |
|
||||
git stripspace > "$dotest/msg-clean"
|
||||
fi
|
||||
;;
|
||||
|
|
Загрузка…
Ссылка в новой задаче