Merge branch 'jc/revision-dash-count-parsing' into maint
"git log -2master" is a common typo that shows two commits starting from whichever random branch that is not 'master' that happens to be checked out currently. * jc/revision-dash-count-parsing: revision: parse "git log -<count>" more carefully
This commit is contained in:
commit
91043fc95c
@ -1649,7 +1649,9 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
|
||||
return argcount;
|
||||
} else if ((*arg == '-') && isdigit(arg[1])) {
|
||||
/* accept -<digit>, like traditional "head" */
|
||||
revs->max_count = atoi(arg + 1);
|
||||
if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
|
||||
revs->max_count < 0)
|
||||
die("'%s': not a non-negative integer", arg + 1);
|
||||
revs->no_walk = 0;
|
||||
} else if (!strcmp(arg, "-n")) {
|
||||
if (argc <= 1)
|
||||
|
Loading…
Reference in New Issue
Block a user