summaryrefslogtreecommitdiff
path: root/strbuf.h
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2007-09-13 22:13:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-14 06:20:47 (GMT)
commit760da9607ee08e9dd495dee993262bb857694ac9 (patch)
treecbfc4a1e45f8ce0af0a472eea4fac4ab9af53bdd /strbuf.h
parentfd17f5b5f77716bf90098c6e49e3cf7fd9f56306 (diff)
downloadgit-760da9607ee08e9dd495dee993262bb857694ac9.zip
git-760da9607ee08e9dd495dee993262bb857694ac9.tar.gz
git-760da9607ee08e9dd495dee993262bb857694ac9.tar.bz2
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>
Diffstat (limited to 'strbuf.h')
0 files changed, 0 insertions, 0 deletions