diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-07-27 13:32:36 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-27 13:28:54 -0700 |
| commit | 35039ced9296786bc0971bf5385c0d6f6ea5ea1e (patch) | |
| tree | 4267ce8dd84a6116fff0732b6924573932f2ecfc /archive.c | |
| parent | 9a9fb5d3c4c8601beb2d7b8e3b9283c6c3815a2d (diff) | |
| download | git-35039ced9296786bc0971bf5385c0d6f6ea5ea1e.tar.gz | |
archive: abbreviate substituted commit ids again
Given a file with:
(define archive-id "$Format:%ct|%h|a$")
and an export-subst attribute, the "%h" results in an full 40-digit
object name instead of the expected 7-digit one.
The export-subst feature requests unabbreviated object names because
that is the low-level default. The effect was not observable until
v1.7.1.1~17^2~3 (2010-05-03), which taught log --format=%h to respect
the --abbrev option.
Reported-by: Eli Barzilay <eli@barzilay.org>
Tested-by: Eli Barzilay <eli@barzilay.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'archive.c')
| -rw-r--r-- | archive.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -33,6 +33,7 @@ static void format_subst(const struct commit *commit, struct strbuf fmt = STRBUF_INIT; struct pretty_print_context ctx = {0}; ctx.date_mode = DATE_NORMAL; + ctx.abbrev = DEFAULT_ABBREV; if (src == buf->buf) to_free = strbuf_detach(buf, NULL); |