With the buildhistory change to commit images and packages changes separately, if both change at once (e.g. when the first build is done with buildhistory enabled) then only images will be committed. This means that the package changes will be silently merged into the next commit that occurs.

This is caused by our old friend the stripping of newlines when echoing a variable value. There is an easy fix - just quote the variable in the echo statement; I will send a patch for this soon.