format-patch/commit: Quote single quote in the author name properly.

Noticed by Kyle McMartin.

Signed-off-by: Junio C Hamano <redacted>

diff --git a/git-commit.sh b/git-commit.sh
index 82d743bd037db74f4233a620b001fb3002f346cc..193feeb5e42f1a486a3aae42935cb98696a2baac 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -165,6 +165,7 @@ then
        then
                pick_author_script='
                /^author /{
+                       s/'\''/'\''\\'\'\''/g
                        h
                        s/^author \([^<]*\) <[^>]*> .*$/\1/
                        s/'\''/'\''\'\'\''/g

diff --git a/git-format-patch.sh b/git-format-patch.sh
index daa3caea778e13e946c4ffe53c876f5222ce7dfe..818059f2429d440396daa313dd7fde98bb4782e0 100755 (executable)
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -173,6 +173,7 @@ titleScript='
 
 whosepatchScript='
 /^author /{
+       s/'\''/'\''\\'\'\''/g
        s/author \(.*>\) \(.*\)$/au='\''\1'\'' ad='\''\2'\''/p
        q
 }'