Following the Goverment's advice and not panicking I didn't fill up until today, the garage was not overly busy though some pumps had no Super Unleaded. I topped up the car and then filled two four gallon jerrycans, these are pucka WWII jeep style things. As I was finishing a chap came out and said that their was a limit of 2 gallons per metal container, which seems a bit daft for given that my jerrycans were specifically designed to carry fuel. Not heard of limits on diesel before and can't find any reference to it. He didn't seem overly concerned and just said bear it in mind in the future, just as well as I wouldn't have fancied trying to get the excess back down the hose