From: Jonas Fonseca <fonseca@diku.dk>
Date: Fri, 25 Aug 2006 00:48:04 +0000 (+0200)
Subject: describe: fix off-by-one error in --abbrev=40 handling
X-Git-Tag: v1.4.3-rc1~194
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f7122265fcb821208c290ad9817d296dec19d523;p=git.git

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>
---

diff --git a/describe.c b/describe.c
index 2b9301fc1..5dd8b2e39 100644
--- a/describe.c
+++ b/describe.c
@@ -42,7 +42,7 @@ static void add_to_known_names(const char *path,
 	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