From b6ae5409ea446365c328561dc17311111058ec26 Mon Sep 17 00:00:00 2001 From: Alex Riesen Date: Thu, 5 Jan 2006 12:44:59 +0100 Subject: trivial: typo in git-commit.sh Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano --- git-commit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-commit.sh') diff --git a/git-commit.sh b/git-commit.sh index 7e39c107cf..82d743bd03 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -148,7 +148,7 @@ esac if [ -f "$GIT_DIR/MERGE_HEAD" ]; then echo "#" - echo "# It looks like your may be committing a MERGE." + echo "# It looks like you may be committing a MERGE." echo "# If this is not correct, please remove the file" echo "# $GIT_DIR/MERGE_HEAD" echo "# and try again" -- cgit v1.2.3 From aa66c7ec77d474b737da607d6cb2d07f56628def Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 5 Jan 2006 19:50:37 -0800 Subject: format-patch/commit: Quote single quote in the author name properly. Noticed by Kyle McMartin. Signed-off-by: Junio C Hamano --- git-commit.sh | 1 + git-format-patch.sh | 1 + 2 files changed, 2 insertions(+) (limited to 'git-commit.sh') diff --git a/git-commit.sh b/git-commit.sh index 82d743bd03..193feeb5e4 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 daa3caea77..818059f242 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 }' -- cgit v1.2.3