tweak logic

Author: vlad-anger

asyncgit/src/sync/config.rs

@@ -63,7 +63,8 @@ pub fn untracked_files_config_repo(
 }
 
 // see https://git-scm.com/docs/git-config#Documentation/git-config.txt-pushdefault
-/// represent `push.default` git config
+/// represents `push.default` git config
+#[derive(PartialEq, Eq)]
 pub enum PushDefaultStrategyConfig {
 	Nothing,
 	Current,
@@ -86,11 +87,11 @@ impl<'a> TryFrom<&'a str> for PushDefaultStrategyConfig {
 		match value {
 			"nothing" => Ok(Self::Nothing),
 			"current" => Ok(Self::Current),
-			"upstream" => Ok(Self::Upstream),
+			"upstream" | "tracking" => Ok(Self::Upstream),
 			"simple" => Ok(Self::Simple),
 			"matching" => Ok(Self::Matching),
-			_ => Err(crate::Error::Generic(format!(
-				"{value} is incorrect push.default"
+			_ => Err(crate::Error::GitConfig(format!(
+				"malformed value for push.default: {value}, must be one of nothing, matching, simple, upstream or current"
 			))),
 		}
 	}
@@ -102,10 +103,7 @@ pub fn push_default_strategy_config_repo(
 	(get_config_string_repo(repo, "push.default")?).map_or_else(
 		|| Ok(PushDefaultStrategyConfig::default()),
 		|entry_str| {
-			Ok(PushDefaultStrategyConfig::try_from(
-				entry_str.as_str(),
-			)
-			.unwrap_or_default())
+			PushDefaultStrategyConfig::try_from(entry_str.as_str())
 		},
 	)
 }

asyncgit/src/sync/remotes/push.rs

@@ -97,7 +97,7 @@ impl AsyncProgress for ProgressNotification {
 }
 
 ///
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum PushType {
 	///
 	Branch,
@@ -166,19 +166,19 @@ pub fn push_raw(
 		(true, false) => "+",
 		(false, false) => "",
 	};
-	let ref_type = match ref_type {
+	let git_ref_type = match ref_type {
 		PushType::Branch => "heads",
 		PushType::Tag => "tags",
 	};
 
 	let mut push_ref =
-		format!("{branch_modifier}refs/{ref_type}/{branch}");
+		format!("{branch_modifier}refs/{git_ref_type}/{branch}");
 
 	if !delete
-		&& matches!(
-			push_default_strategy,
-			PushDefaultStrategyConfig::Upstream
-		) {
+		&& ref_type == PushType::Branch
+		&& push_default_strategy
+			== PushDefaultStrategyConfig::Upstream
+	{
 		if let Ok(Some(branch_upstream_merge)) =
 			get_branch_upstream_merge(repo_path, branch)
 		{