Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix'

diff --git a/builtin/blame.c b/builtin/blame.c
index 463978817871b534dcdfb3c5c630ccd731d9733a..4242e4b513101a09b0f027188095ba3032802d3b 100644 (file)
--- 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;