summaryrefslogtreecommitdiff
path: root/t/t5404-tracking-branches.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2010-09-29 16:41:08 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-11-10 08:42:40 -0800
commit2d502e1f378a39ef375d6d5c1b3312d286ed2524 (patch)
treeed9fa8c801dd2c06b0b3bb67818ea98e6ed1e1a0 /t/t5404-tracking-branches.sh
parentapply: Recognize epoch timestamps with : in the timezone (diff)
downloadtgif-2d502e1f378a39ef375d6d5c1b3312d286ed2524.tar.xz
apply: handle patches with funny filename and colon in timezone
Some patches have a timezone formatted like '-08:00' instead of '-0800' in their ---/+++ lines (e.g. http://lwn.net/Articles/131729/). Take this into account when searching for the start of the timezone (which is the end of the filename). This does not actually affect the outcome of patching unless (1) a file being patched has a non-' ' whitespace character (e.g., tab) in its filename, or (2) the patch is whitespace-damaged, so the tab between filename and timestamp has been replaced with spaces. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5404-tracking-branches.sh')
0 files changed, 0 insertions, 0 deletions