Merge branch 'jc/mailinfo' into next

diff --git a/diff.c b/diff.c
index be459cac6946fffeba71301416dd9443c1d44eff..d8c00dbc466507ba3c8a038f8dcd7b864960f60a 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -432,7 +432,7 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
        else if (line[0] == '@') {
                char *plus = strchr(line, '+');
                if (plus)
-                       data->lineno = strtol(plus, line + len, 10);
+                       data->lineno = strtol(plus, NULL, 10);
                else
                        die("invalid diff");
        }