diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:45:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-13 10:45:00 -0700 |
| commit | bc67ad8c375ce8f31021411f088a968f12cb2675 (patch) | |
| tree | 5cc9d598cf4040177c3765322f9b5f2551ba0d08 /builtin | |
| parent | 978471dccec18daab3165c60a90ad59cbdb43723 (diff) | |
| parent | c01bd5a29f38e4e9fd5c03f3e1e84b88c392dd6f (diff) | |
| download | git-bc67ad8c375ce8f31021411f088a968f12cb2675.tar.gz git-bc67ad8c375ce8f31021411f088a968f12cb2675.tar.xz | |
Merge branch 'js/blame-parsename' into maint
* js/blame-parsename:
t/annotate-tests: Use echo & cat instead of sed
blame: tolerate bogus e-mail addresses a bit better
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/blame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index f6b03f750..41525f1ea 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; |