X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fshortlog.c;h=5089502800d5f477f47b6cd6499d278097f11e67;hb=6f79d6689193dad107b9424e9bd699d20c7d5c33;hp=06320f5285988365b8340e110427866e68536b47;hpb=809780b662355a9ded05b450a07bbe79d0d2e26e;p=git.git diff --git a/builtin/shortlog.c b/builtin/shortlog.c index 06320f528..508950280 100644 --- a/builtin/shortlog.c +++ b/builtin/shortlog.c @@ -162,7 +162,7 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit) sha1_to_hex(commit->object.sha1)); if (log->user_format) { struct pretty_print_context ctx = {0}; - ctx.abbrev = DEFAULT_ABBREV; + ctx.abbrev = log->abbrev; ctx.subject = ""; ctx.after_subject = ""; ctx.date_mode = DATE_NORMAL; @@ -290,6 +290,7 @@ parse_done: } log.user_format = rev.commit_format == CMIT_FMT_USERFORMAT; + log.abbrev = rev.abbrev; /* assume HEAD if from a tty */ if (!nongit && !rev.pending.nr && isatty(0))