Merge branch 'jc/worktree-config' into maint

diff --git a/builtin/blame.c b/builtin/blame.c
index a5bbf91e497524215c884f1e145070afcf3f586a..f618392e55f70966accc49aa7ff22de2d16f189f 100644 (file)
--- 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;