From 508d9e372e0e3cfa55a6224eca5e214364fc66b4 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 27 May 2006 12:24:30 -0700 Subject: [PATCH] Fix "--abbrev=xyz" for revision listing The revision argument parsing was happily parsing "--abbrev", but it didn't parse "--abbrev=". Which was hidden by the fact that the diff options _would_ parse --abbrev=, 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 Signed-off-by: Junio C Hamano --- revision.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/revision.c b/revision.c index 2294b16ea..42c077a4c 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; -- 2.26.2