When updating directly to origin/master, we can't rely on the position of origin/master for the original_tracking_sha, instead we want the common ancestor