fix compile errors

Author: bomgar

src/git/mod.rs

@@ -81,7 +81,7 @@ pub fn update_project_remotes(project: &Project, path: &Path, ff_merge: bool) ->
 			.or_else(|_| local.remote(&desired_remote.name, &desired_remote.git))?;
 
 		let mut remote = match remote.url() {
-			Some(url) if url == desired_remote.git => remote,
+			Ok(url) if url == desired_remote.git => remote,
 			_ => {
 				local.remote_set_url(&desired_remote.name, &desired_remote.git)?;
 				local.find_remote(&desired_remote.name)?

src/setup/mod.rs

@@ -117,7 +117,7 @@ fn load_project(maybe_settings: Option<Settings>, path_to_repo: PathBuf, name: &
 	let remote = repo.find_remote("origin")?;
 	let url = remote
 		.url()
-		.ok_or_else(|| AppError::UserError(format!("invalid remote origin at {:?}", repo.path())))?;
+		.map_err(|_| AppError::UserError(format!("invalid remote origin at {:?}", repo.path())))?;
 	Ok(Project {
 		name: name.to_owned(),
 		git: url.to_owned(),