aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-06 14:53:10 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-06 14:53:10 -0700
commit3b01d9aee0d2a54f0dd4704e22dfb49ae08203d5 (patch)
tree147c307c143bda6b782a3e8ac9b529b68acfefa1 /builtin
parent8c98a68981177013dfa0380968b57a1a37a45539 (diff)
parent5293284b4d92cc1029ae8355b7e1330fa7b451a6 (diff)
downloadgit-3b01d9aee0d2a54f0dd4704e22dfb49ae08203d5.tar.gz
git-3b01d9aee0d2a54f0dd4704e22dfb49ae08203d5.tar.xz
Merge branch 'jc/blame-abbrev'
Almost everybody uses DEFAULT_ABBREV to refer to the default setting for the abbreviation, but "git blame" peeked into underlying variable bypassing the macro for no good reason. * jc/blame-abbrev: blame: use DEFAULT_ABBREV macro
Diffstat (limited to 'builtin')
-rw-r--r--builtin/blame.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index a7bd7a6fd..da44b36ff 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2111,7 +2111,7 @@ static void find_alignment(struct scoreboard *sb, int *option)
unsigned largest_score = 0;
struct blame_entry *e;
int compute_auto_abbrev = (abbrev < 0);
- int auto_abbrev = default_abbrev;
+ int auto_abbrev = DEFAULT_ABBREV;
for (e = sb->ent; e; e = e->next) {
struct origin *suspect = e->suspect;