@matheusbsbs / matheus-bagliano / commits / 760da9607e
Fork 0

archive: fix subst file generation

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>

René Scharfe committed Sep 14, 2007 at 00:13 UTC 760da9607ee08e9dd495dee993262bb857694ac9
2 files changed +10 -9
builtin-archive.c
+1 -3
@@ -111,9 +111,7 @@ static void *format_subst(const struct commit *commit, const char *format,
111 a = c + 1;
112 }
113
114 - if (result.len && len) {
115 - strbuf_add(&result, a, len);
116 - }
114 + strbuf_add(&result, a, len);
115
116 *sizep = result.len;
117
t/t5000-tar-tree.sh
+9 -6
@@ -36,7 +36,8 @@ test_expect_success \
36 echo simple textfile >a/a &&
37 mkdir a/bin &&
38 cp /bin/sh a/bin &&
39 - printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile &&
39 + printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
40 + printf "A not substituted O" >a/substfile2 &&
41 ln -s a a/l1 &&
42 (p=long_path_to_a_file && cd a &&
43 for depth in 1 2 3 4 5; do mkdir $p && cd $p; done &&
@@ -108,20 +109,22 @@ test_expect_success \
109 'diff -r a c/prefix/a'
110
111 test_expect_success \
111 - 'create an archive with a substfile' \
112 - 'echo substfile export-subst >a/.gitattributes &&
112 + 'create an archive with a substfiles' \
113 + 'echo "substfile?" export-subst >a/.gitattributes &&
114 git archive HEAD >f.tar &&
115 rm a/.gitattributes'
116
117 test_expect_success \
117 - 'extract substfile' \
118 + 'extract substfiles' \
119 '(mkdir f && cd f && $TAR xf -) <f.tar'
120
121 test_expect_success \
122 'validate substfile contents' \
123 'git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
123 - >f/a/substfile.expected &&
124 - diff f/a/substfile.expected f/a/substfile'
124 + >f/a/substfile1.expected &&
125 + diff f/a/substfile1.expected f/a/substfile1 &&
126 + diff a/substfile2 f/a/substfile2
127 +'
128
129 test_expect_success \
130 'git archive --format=zip' \