mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

archive: fix subst file generation

Browse Source 
Before the strbuf conversion, result was a char pointer.  The if
statement checked for it being not NULL, which meant that no
"$Format:...$" string had been found and no replacement had to be
made.  format_subst() returned NULL in that case -- the caller
then simply kept the original file content, as it was unaffected
by the expansion.

The length of the string being 0 is not the same as the string
being NULL (expansion to an empty string vs. no expansion at all),
so checking result.len != 0 is not a full replacement for the old
NULL check.

However, I doubt the subtle optimization explained above resulted
in a notable speed-up anyway.  Simplify the code and add the tail
of the file to the expanded string unconditionally.

[jc: added a test to expose the breakage this fixes]

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2007-09-14 00:13:06 +02:00
committed by Junio C Hamano
parent fd17f5b5f7
commit 760da9607e
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-archive.c
View File

@ -111,9 +111,7 @@ static void *format_subst(const struct commit *commit, const char *format,
a = c + 1; a = c + 1;
} }
if (result.len && len) {
strbuf_add(&result, a, len); strbuf_add(&result, a, len);
}
*sizep = result.len; *sizep = result.len;

15
t/t5000-tar-tree.sh
View File

@ -36,7 +36,8 @@ test_expect_success \
echo simple textfile >a/a && echo simple textfile >a/a &&
mkdir a/bin && mkdir a/bin &&
cp /bin/sh a/bin && cp /bin/sh a/bin &&
printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile && printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
printf "A not substituted O" >a/substfile2 &&
ln -s a a/l1 && ln -s a a/l1 &&
(p=long_path_to_a_file && cd a && (p=long_path_to_a_file && cd a &&
for depth in 1 2 3 4 5; do mkdir $p && cd $p; done && for depth in 1 2 3 4 5; do mkdir $p && cd $p; done &&
@ -108,20 +109,22 @@ test_expect_success \
'diff -r a c/prefix/a' 'diff -r a c/prefix/a'
test_expect_success \ test_expect_success \
'create an archive with a substfile' \ 'create an archive with a substfiles' \
'echo substfile export-subst >a/.gitattributes && 'echo "substfile?" export-subst >a/.gitattributes &&
git archive HEAD >f.tar && git archive HEAD >f.tar &&
rm a/.gitattributes' rm a/.gitattributes'
test_expect_success \ test_expect_success \
'extract substfile' \ 'extract substfiles' \
'(mkdir f && cd f && $TAR xf -) <f.tar' '(mkdir f && cd f && $TAR xf -) <f.tar'
test_expect_success \ test_expect_success \
'validate substfile contents' \ 'validate substfile contents' \
'git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \ 'git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
>f/a/substfile.expected && >f/a/substfile1.expected &&
diff f/a/substfile.expected f/a/substfile' diff f/a/substfile1.expected f/a/substfile1 &&
diff a/substfile2 f/a/substfile2
'
test_expect_success \ test_expect_success \
'git archive --format=zip' \ 'git archive --format=zip' \