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>
Jonathan Nieder committed
Jul 27, 2010 at 13:32 UTC
35039ced9296786bc0971bf5385c0d6f6ea5ea1e
2 files changed
+2
-1
archive.c
+1
@@ -33,6 +33,7 @@ static void format_subst(const struct commit *commit,
33
struct strbuf fmt = STRBUF_INIT;
34
struct pretty_print_context ctx = {0};
35
ctx.date_mode = DATE_NORMAL;
36
+ ctx.abbrev = DEFAULT_ABBREV;
37
38
if (src == buf->buf)
39
to_free = strbuf_detach(buf, NULL);
t/t5001-archive-attr.sh
+1
-1
@@ -4,7 +4,7 @@ test_description='git archive attribute tests'
4
5
. ./test-lib.sh
6
7
-SUBSTFORMAT=%H%n
7
+SUBSTFORMAT='%H (%h)%n'
8
9
test_expect_exists() {
10
test_expect_success " $1 exists" "test -e $1"