describe: fix off-by-one error in --abbrev=40 handling

PATCH New Jonas Fonseca 1 participant 1 message Jun 15, 2016

lore

Share & tools

lore

Jonas Fonseca

author

2016-06-15 22:42 UTC #0 lore raw

PATCH 1/1 describe: fix off-by-one error in --abbrev=40 handling

Signed-off-by Jonas Fonseca <[email protected]>

---

Possible stupid fix, but shouldn't one be able to say --abbrev=40 if only once in a life time?

 describe.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

describe.c +2 -2

index 2b9301f..5dd8b2e 100644
@@ -42,7 +42,7 @@ static void add_to_known_names(const cha
 	struct commit_name *name = xmalloc(sizeof(struct commit_name) + len);
 
 	name->commit = commit;
-	name->prio = prio; 
+	name->prio = prio;
 	memcpy(name->path, path, len);
 	idx = names;
 	if (idx >= allocs) {

@@ -154,7 +154,7 @@ int main(int argc, char **argv)
 			tags = 1;
 		else if (!strncmp(arg, "--abbrev=", 9)) {
 			abbrev = strtoul(arg + 9, NULL, 10);
-			if (abbrev < MINIMUM_ABBREV || 40 <= abbrev)
+			if (abbrev < MINIMUM_ABBREV || 40 < abbrev)
 				abbrev = DEFAULT_ABBREV;
 		}
 		else

Signature · 1 line

Jonas Fonseca