Ensure that upstream commits are handled correctly.