Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/revision-dash-count-parsing'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 20 Jun 2014 20:10:25 +0000
(13:10 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 20 Jun 2014 20:10:25 +0000
(13:10 -0700)
"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
revision.c
patch
|
blob
|
history
raw
(from parent 1:
cb682f8
)
diff --git
a/revision.c
b/revision.c
index 3818b4628d0b5b4fa74428decaa940bef2804856..8351e794df943ea6ea7acde40c01c97c20be4576 100644
(file)
--- a/
revision.c
+++ b/
revision.c
@@
-1649,8
+1649,10
@@
static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->skip_count = atoi(optarg);
return argcount;
} else if ((*arg == '-') && isdigit(arg[1])) {
- /* accept -<digit>, like traditional "head" */
- revs->max_count = atoi(arg + 1);
+ /* accept -<digit>, like traditional "head" */
+ 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)