diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-18 22:58:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-18 22:58:32 -0700 |
| commit | d9f39d9838f089c145817c6c0f25ffedcb1c500e (patch) | |
| tree | 1489fcf3173ed657df1340b1c9a0063ce8da3daa /git-am.sh | |
| parent | 9a49e00b9a239c58e074bab6e147b293809a3c6f (diff) | |
| parent | 5634cf24766f8700804ca55f5e8567c88538a5b0 (diff) | |
| download | git-d9f39d9838f089c145817c6c0f25ffedcb1c500e.tar.gz | |
Merge branch 'maint'
* maint:
gitweb: Fix 'history' view for deleted files with history
Document that WebDAV doesn't need git on the server, and works over SSL
git-remote: reject adding remotes with invalid names
am: POSIX portability fix
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -330,7 +330,7 @@ do SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")" case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac - (echo "$SUBJECT" ; echo ; cat "$dotest/msg") | + (printf '%s\n\n' "$SUBJECT"; cat "$dotest/msg") | git stripspace > "$dotest/msg-clean" ;; esac |