summaryrefslogtreecommitdiff
path: root/transport.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-27 14:58:47 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-27 14:58:47 -0700
commit580d820ece78100c5e2b8b5874d7aed5d76715f2 (patch)
tree5429c7137041134b69cd26ad10cd79e1416cc0a8 /transport.h
parent2cc2e70264e0fcba04f9ef791d144bbc8b501206 (diff)
parente6c587c733b4634030b353f4024794b08bc86892 (diff)
downloadgit-580d820ece78100c5e2b8b5874d7aed5d76715f2.tar.gz
Merge branch 'lt/abbrev-auto'
Allow the default abbreviation length, which has historically been 7, to scale as the repository grows. The logic suggests to use 12 hexdigits for the Linux kernel, and 9 to 10 for Git itself. * lt/abbrev-auto: abbrev: auto size the default abbreviation abbrev: prepare for new world order abbrev: add FALLBACK_DEFAULT_ABBREV to prepare for auto sizing
Diffstat (limited to 'transport.h')
-rw-r--r--transport.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/transport.h b/transport.h
index 68669f14d0..5624c0218c 100644
--- a/transport.h
+++ b/transport.h
@@ -147,8 +147,7 @@ struct transport {
#define TRANSPORT_PUSH_ATOMIC 8192
#define TRANSPORT_PUSH_OPTIONS 16384
-#define TRANSPORT_SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
-#define TRANSPORT_SUMMARY(x) (int)(TRANSPORT_SUMMARY_WIDTH + strlen(x) - gettext_width(x)), (x)
+#define TRANSPORT_SUMMARY_WIDTH (2 * FALLBACK_DEFAULT_ABBREV + 3)
/* Returns a transport suitable for the url */
struct transport *transport_get(struct remote *, const char *);