From: Junio C Hamano <junkio@cox.net>
Date: Fri, 27 Jan 2006 10:19:51 +0000 (-0800)
Subject: diff --abbrev=<n> option fix.
X-Git-Tag: v1.2.0~100^5
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6b1ddbdd6e02719ae2be55dc141a176187e5027e;p=git.git

diff --abbrev=<n> option fix.

Earier specifying an abbreviation shorter than minimum fell back
to full 40 letters, which was nonsense.  Make it to fall back to
the minimum number (currently 4).

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/diff.c b/diff.c
index 69767b9d..8ae6dbc6 100644
--- a/diff.c
+++ b/diff.c
@@ -847,8 +847,13 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
 		options->find_copies_harder = 1;
 	else if (!strcmp(arg, "--abbrev"))
 		options->abbrev = DEFAULT_ABBREV;
-	else if (!strncmp(arg, "--abbrev=", 9))
+	else if (!strncmp(arg, "--abbrev=", 9)) {
 		options->abbrev = strtoul(arg + 9, NULL, 10);
+		if (options->abbrev < MINIMUM_ABBREV)
+			options->abbrev = MINIMUM_ABBREV;
+		else if (40 < options->abbrev)
+			options->abbrev = 40;
+	}
 	else
 		return 0;
 	return 1;