diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:50:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:50:32 -0700 |
| commit | 2190a43c42a049d75344a381f3c8d947876c997b (patch) | |
| tree | d4b13f587a30d5a4647bdbde192dee9c354be38b /builtin | |
| parent | ace8ebbcf5f07a5519cbeb0ae0571d8b40222e34 (diff) | |
| parent | c01bd5a29f38e4e9fd5c03f3e1e84b88c392dd6f (diff) | |
| download | git-2190a43c42a049d75344a381f3c8d947876c997b.tar.gz git-2190a43c42a049d75344a381f3c8d947876c997b.tar.xz | |
Merge branch 'js/blame-parsename'
* 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 463978817..4242e4b51 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -1378,7 +1378,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; |