summaryrefslogtreecommitdiff
path: root/archive.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-07-27 18:32:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-27 20:28:54 (GMT)
commit35039ced9296786bc0971bf5385c0d6f6ea5ea1e (patch)
tree4267ce8dd84a6116fff0732b6924573932f2ecfc /archive.c
parent9a9fb5d3c4c8601beb2d7b8e3b9283c6c3815a2d (diff)
downloadgit-35039ced9296786bc0971bf5385c0d6f6ea5ea1e.zip
git-35039ced9296786bc0971bf5385c0d6f6ea5ea1e.tar.gz
git-35039ced9296786bc0971bf5385c0d6f6ea5ea1e.tar.bz2
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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/archive.c b/archive.c
index d700af3..edd6853 100644
--- a/archive.c
+++ b/archive.c
@@ -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);