summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@inf.ethz.ch>2013-09-12 07:15:40 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-12 15:27:01 -0700
commita7f0a0efa5aa2459e284a2aa5a217324bf9d3875 (patch)
tree9e9ae52ffee3d4810b9fc4330c9eb9f6345ba013 /git-merge-one-file.sh
parentbuiltin/config.c: compilation fix (diff)
downloadtgif-a7f0a0efa5aa2459e284a2aa5a217324bf9d3875.tar.xz
urlmatch.c: recompute pointer after append_normalized_escapes
When append_normalized_escapes is called, its internal strbuf_add* calls can cause the strbuf's buf to be reallocated changing the value of the buf pointer. Do not use the strbuf buf pointer from before any append_normalized_escapes calls afterwards. Instead recompute the needed pointer. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions