undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/revision-dash-count-parsing' into maint

Browse Source 
"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:
Junio C Hamano 2014-06-25 11:44:53 -07:00
commit 91043fc95c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
revision.c
View File

@ -1648,8 +1648,10 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->skip_count = atoi(optarg); revs->skip_count = atoi(optarg);
return argcount; return argcount;
} else if ((*arg == '-') && isdigit(arg[1])) { } else if ((*arg == '-') && isdigit(arg[1])) {
/* accept -<digit>, like traditional "head" */ /* 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; revs->no_walk = 0;
} else if (!strcmp(arg, "-n")) { } else if (!strcmp(arg, "-n")) {
if (argc <= 1) if (argc <= 1)