One of my git repositories has some old commits where the authors
obfuscated their email address as <author at example dot com>. To
handle this, blame needs to look for the leading '<' when scanning
to split the "name <email>", rather then only a space delimiter.
Signed-off-by: Josh Stone <jistone@xxxxxxxxxx>
---
builtin/blame.c | 2 +-
t/annotate-tests.sh | 12 +++++++++++-
t/t8002-blame.sh | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/builtin/blame.c b/builtin/blame.c
index f6b03f7..41525f1 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -1377,7 +1377,7 @@ static void get_ac_line(const char *inbuf, const char *what,
timepos = tmp;
*tmp = 0;
- while (person < tmp && *tmp != ' ')
+ while (person < tmp && !(*tmp == ' ' && tmp[1] == '<'))
tmp--;
if (tmp <= person)
return;
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index d34208c..abb1885 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -1,5 +1,5 @@
# This file isn't used as a test script directly, instead it is
-# sourced from t8001-annotate.sh and t8001-blame.sh.
+# sourced from t8001-annotate.sh and t8002-blame.sh.
check_count () {
head=
@@ -124,3 +124,13 @@ test_expect_success \
test_expect_success \
'some edit' \
'check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1'
+
+test_expect_success \
+ 'an obfuscated email added' \
+ 'sed -e "1i No robots allowed" < file > file.new &&
+ mv file.new file &&
+ GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" git commit -a -m "norobots"'
+
+test_expect_success \
+ 'obfuscated email parsed' \
+ 'check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1'
diff --git a/t/t8002-blame.sh b/t/t8002-blame.sh
index d3a51e1..e2896cf 100755
--- a/t/t8002-blame.sh
+++ b/t/t8002-blame.sh
@@ -8,7 +8,7 @@ PROG='git blame -c'
PROG='git blame -c -e'
test_expect_success 'Blame --show-email works' '
- check_count "<A@xxxxxxxx>" 1 "<B@xxxxxxxx>" 1 "<B1@xxxxxxxx>" 1 "<B2@xxxxxxxx>" 1 "<author@xxxxxxxxxxx>" 1 "<C@xxxxxxxx>" 1 "<D@xxxxxxxx>" 1
+ check_count "<A@xxxxxxxx>" 1 "<B@xxxxxxxx>" 1 "<B1@xxxxxxxx>" 1 "<B2@xxxxxxxx>" 1 "<author@xxxxxxxxxxx>" 1 "<C@xxxxxxxx>" 1 "<D@xxxxxxxx>" 1 "<E at test dot git>" 1
'
test_done
--
1.7.4.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html