aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-05 19:50:37 -0800
committerJunio C Hamano <junkio@cox.net>2006-01-05 20:02:33 -0800
commitaa66c7ec77d474b737da607d6cb2d07f56628def (patch)
treeb8090092fd2c9fe9b5365332ee7d421233c14403
parent81214e4ddf2f0114ce7756a014dc533340fcb3f9 (diff)
downloadgit-aa66c7ec77d474b737da607d6cb2d07f56628def.tar.gz
git-aa66c7ec77d474b737da607d6cb2d07f56628def.tar.xz
format-patch/commit: Quote single quote in the author name properly.
Noticed by Kyle McMartin. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-commit.sh1
-rwxr-xr-xgit-format-patch.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/git-commit.sh b/git-commit.sh
index 82d743bd0..193feeb5e 100755
--- 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 daa3caea7..818059f24 100755
--- 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
}'