1
0
mirror of https://github.com/git/git.git synced 2025-03-15 08:12:22 +00:00

Merge branch 'jc/maint-am-keep' into maint

* jc/maint-am-keep:
  Remove dead code from "git am"
This commit is contained in:
Junio C Hamano 2009-12-03 13:54:03 -08:00
commit 78b77c491f

View File

@ -577,11 +577,12 @@ do
git cat-file commit "$commit" | git cat-file commit "$commit" |
sed -e '1,/^$/d' >"$dotest/msg-clean" sed -e '1,/^$/d' >"$dotest/msg-clean"
else else
SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")" {
case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac sed -n '/^Subject/ s/Subject: //p' "$dotest/info"
echo
(printf '%s\n\n' "$SUBJECT"; cat "$dotest/msg") | cat "$dotest/msg"
git stripspace > "$dotest/msg-clean" } |
git stripspace > "$dotest/msg-clean"
fi fi
;; ;;
esac esac