summaryrefslogtreecommitdiff
path: root/t/t6025-merge-symlinks.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2008-04-30 00:13:58 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-04-29 22:22:19 -0700
commit861f00e3496fd5cd866a73f11826dfc8822a5195 (patch)
treeb651073ae4a7e7f005c2016498d614f61cf3b7b3 /t/t6025-merge-symlinks.sh
parentRemove 'header' from --signoff option description (diff)
downloadtgif-861f00e3496fd5cd866a73f11826dfc8822a5195.tar.xz
fix reflog approxidate parsing bug
In get_sha1_basic, we parse a string like HEAD@{10 seconds ago}:path/to/file into its constituent ref, reflog date, and path components. We never actually munge the string itself, but instead keep offsets into the string with their associated lengths. When we call approxidate on the contents inside braces, however, we pass just a string without a length. This means that approxidate could sometimes look past the closing brace and (erroneously) interpret the rest of the string as part of the date. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6025-merge-symlinks.sh')
0 files changed, 0 insertions, 0 deletions