Merge branch 'jc/mailinfo' into next

* jc/mailinfo:
  mailinfo: skip bogus UNIX From line inside body
  tutorial-2: typofix in examples.
  tutorial: add discussion of index file, object database
  tutorial: expanded discussion of commit history
  tutorial: replace "whatchanged" by "log"
  NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).
  remove superflous "const"
  checkdiff_consume: strtol parameter fix.
  Elaborate on why ':' is a bad idea in a ref name.
  Reference git-check-ref-format in git-branch.

1 files changed, 1 insertions, 1 deletions

diff --git a/diff.c b/diff.c
index be459cac69..d8c00dbc46 100644
--- 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");
 	}