describe: fix off-by-one error in --abbrev=40 handling
Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:

committed by
Junio C Hamano

parent
0ea4d4c94b
commit
f7122265fc
@ -42,7 +42,7 @@ static void add_to_known_names(const char *path,
|
|||||||
struct commit_name *name = xmalloc(sizeof(struct commit_name) + len);
|
struct commit_name *name = xmalloc(sizeof(struct commit_name) + len);
|
||||||
|
|
||||||
name->commit = commit;
|
name->commit = commit;
|
||||||
name->prio = prio;
|
name->prio = prio;
|
||||||
memcpy(name->path, path, len);
|
memcpy(name->path, path, len);
|
||||||
idx = names;
|
idx = names;
|
||||||
if (idx >= allocs) {
|
if (idx >= allocs) {
|
||||||
@ -154,7 +154,7 @@ int main(int argc, char **argv)
|
|||||||
tags = 1;
|
tags = 1;
|
||||||
else if (!strncmp(arg, "--abbrev=", 9)) {
|
else if (!strncmp(arg, "--abbrev=", 9)) {
|
||||||
abbrev = strtoul(arg + 9, NULL, 10);
|
abbrev = strtoul(arg + 9, NULL, 10);
|
||||||
if (abbrev < MINIMUM_ABBREV || 40 <= abbrev)
|
if (abbrev < MINIMUM_ABBREV || 40 < abbrev)
|
||||||
abbrev = DEFAULT_ABBREV;
|
abbrev = DEFAULT_ABBREV;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
Reference in New Issue
Block a user