Split updateOrigin and updateForkStatus