From: Linus Torvalds <torvalds@osdl.org>
Date: Sat, 27 May 2006 19:24:30 +0000 (-0700)
Subject: Fix "--abbrev=xyz" for revision listing
X-Git-Tag: v1.4.0-rc1~57
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=508d9e372e0e3cfa55a6224eca5e214364fc66b4;p=git.git

Fix "--abbrev=xyz" for revision listing

The revision argument parsing was happily parsing "--abbrev", but it
didn't parse "--abbrev=<n>".

Which was hidden by the fact that the diff options _would_ parse
--abbrev=<n>, so it would actually silently parse it, it just
wouldn't use it for the same things that a plain "--abbrev" was
used for.

Which seems a bit insane.

With this patch, if you do "git log --abbrev=10" it will abbreviate the
merge parent commit ID's to ten hex characters, which was probably what
you expected.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/revision.c b/revision.c
index 2294b16e..42c077a4 100644
--- a/revision.c
+++ b/revision.c
@@ -733,6 +733,14 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 				revs->abbrev = DEFAULT_ABBREV;
 				continue;
 			}
+			if (!strncmp(arg, "--abbrev=", 9)) {
+				revs->abbrev = strtoul(arg + 9, NULL, 10);
+				if (revs->abbrev < MINIMUM_ABBREV)
+					revs->abbrev = MINIMUM_ABBREV;
+				else if (revs->abbrev > 40)
+					revs->abbrev = 40;
+				continue;
+			}
 			if (!strcmp(arg, "--abbrev-commit")) {
 				revs->abbrev_commit = 1;
 				continue;