diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-11 14:19:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-11 14:19:52 -0700 |
| commit | 9534df98683e4268628619fb86af29e11e6db353 (patch) | |
| tree | 4439e048220942d474a00b0b7146ad8557a50377 /builtin | |
| parent | 18fd96f1d706357704c8d51f12b9412cd424ac49 (diff) | |
| parent | 5293284b4d92cc1029ae8355b7e1330fa7b451a6 (diff) | |
| download | git-9534df98683e4268628619fb86af29e11e6db353.tar.gz | |
Merge branch 'jc/blame-abbrev' into maint
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index a5bbf91e49..f618392e55 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; |