diff options
author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2007-09-14 00:13:06 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-09-13 23:20:47 -0700 |
commit | 760da9607ee08e9dd495dee993262bb857694ac9 (patch) | |
tree | cbfc4a1e45f8ce0af0a472eea4fac4ab9af53bdd /dir.h | |
parent | Replace all read_fd use with strbuf_read, and get rid of it. (diff) | |
download | tgif-760da9607ee08e9dd495dee993262bb857694ac9.tar.xz |
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 'dir.h')
0 files changed, 0 insertions, 0 deletions