[PATCH 1/3] archive: abbreviate substituted commit ids again
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Jul 27, 2010, 18:32 UTC
- Message-ID
- <20100727183236.GC5578@burratino>
- In-Reply-To
- <20100727182942.GB5578@burratino>
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> --- I carried over the tested-by; I hope that’s okay. Well, I’ve tested the new patch myself, at least. :)
archive.c | 1 + t/t5001-archive-attr.sh | 2 +- 2 files changed, 2 insertions(+), 1 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); diff --git a/t/t5001-archive-attr.sh b/t/t5001-archive-attr.sh index 426b319..02d4d22 100755 --- a/t/t5001-archive-attr.sh +++ b/t/t5001-archive-attr.sh @@ -4,7 +4,7 @@ test_description='git archive attribute tests' . ./test-lib.sh -SUBSTFORMAT=%H%n +SUBSTFORMAT='%H (%h)%n' test_expect_exists() { test_expect_success " $1 exists" "test -e $1"
-- 1.7.2.21.g04ff