aboutsummaryrefslogtreecommitdiff
path: root/git-sh-setup.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-13 11:42:15 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-13 11:42:15 -0800
commit87cb3b82a42613dc3ffd1eddf95f8c306a045ad1 (patch)
tree056bc067a0f6de58609373179d1795df07821627 /git-sh-setup.sh
parent5a62b531ae1fda10d023082cb73a5440dbd54df1 (diff)
parent2c733fb24c10a9d7aacc51f956bf9b7881980870 (diff)
downloadgit-87cb3b82a42613dc3ffd1eddf95f8c306a045ad1.tar.gz
git-87cb3b82a42613dc3ffd1eddf95f8c306a045ad1.tar.xz
Merge branch 'jc/parse-date-raw' into maint
* jc/parse-date-raw: parse_date(): '@' prefix forces git-timestamp parse_date(): allow ancient git-timestamp
Diffstat (limited to 'git-sh-setup.sh')
-rw-r--r--git-sh-setup.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 1fba6c2de..5d8e4e6c8 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -200,7 +200,7 @@ get_author_ident_from_commit () {
s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
g
- s/^author [^<]* <[^>]*> \(.*\)$/\1/
+ s/^author [^<]* <[^>]*> \(.*\)$/@\1/
s/.*/GIT_AUTHOR_DATE='\''&'\''/p
q