diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-17 03:22:51 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-17 03:22:51 +0400 |
| commit | 799c34449e6e54c7e5fc0c623115ada4c868c64d (patch) | |
| tree | 132bb32850f2cc54b4995b0f3a8a127354ece43e /builtin | |
| parent | 318d4013461dbd6fc6bbd05983fc4a9fd5465769 (diff) | |
| parent | c197702156e2164074327f5e870ab0d3021977fc (diff) | |
Merge branch 'jn/shortlog' into maint
* jn/shortlog:
pretty: Respect --abbrev option
shortlog: Document and test --format option
t4201 (shortlog): Test output format with multiple authors
t4201 (shortlog): guard setup with test_expect_success
Documentation/shortlog: scripted users should not rely on implicit HEAD
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/shortlog.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/shortlog.c b/builtin/shortlog.c index 06320f5285..5089502800 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)) |