summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Tal Kelrich <hasturkun@gmail.com>2021-08-31 15:55:54 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-08-31 12:11:57 -0700
commit2f040a96711aaa576ce983b962b4e92abfa238b4 (patch)
tree035a32854d9333211208dd4b8003d7fec732c962 /builtin/merge.c
parentGit 2.31.1 (diff)
downloadtgif-2f040a96711aaa576ce983b962b4e92abfa238b4.tar.xz
fast-export: fix anonymized tag using original length
Commit 7f4075949686 (fast-export: tighten anonymize_mem() interface to handle only strings, 2020-06-23) changed the interface used in anonymizing strings, but failed to update the size of annotated tag messages to match the new anonymized string. As a result, exporting tags having messages longer than 13 characters would create output that couldn't be parsed by fast-import, as the data length indicated was larger than the data output. Reset the message size when anonymizing, and add a tag with a "long" message to the test. Signed-off-by: Tal Kelrich <hasturkun@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions