git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Fix "--abbrev=xyz" for revision listing
@ 2006-05-27 19:24 Linus Torvalds
  0 siblings, 0 replies; only message in thread
From: Linus Torvalds @ 2006-05-27 19:24 UTC (permalink / raw)
  To: Junio C Hamano, Git Mailing List


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>
---
diff --git a/revision.c b/revision.c
index 2294b16..42c077a 100644
--- a/revision.c
+++ b/revision.c
@@ -733,6 +733,14 @@ int setup_revisions(int argc, const char
 				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;

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2006-05-27 19:24 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-05-27 19:24 Fix "--abbrev=xyz" for revision listing Linus Torvalds

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).