summaryrefslogtreecommitdiff
path: root/diff.c
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 /diff.c
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 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index ae87888d1f..5a4e9b31ef 100644
--- a/diff.c
+++ b/diff.c
@@ -3468,7 +3468,7 @@ void diff_setup_done(struct diff_options *options)
*/
read_cache();
}
- if (options->abbrev <= 0 || 40 < options->abbrev)
+ if (40 < options->abbrev)
options->abbrev = 40; /* full */
/*