Merge remote-tracking branch 'upstream/master' into enable-unstable-sha-256-for-git2

Author: cruessler

.github/workflows/ci.yml

@@ -344,7 +344,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Set up Homebrew
-        uses: Homebrew/actions/setup-homebrew@master
+        uses: Homebrew/actions/setup-homebrew@main
 
       - name: Install stable Rust
         uses: actions-rs/toolchain@v1

README.md

@@ -109,7 +109,7 @@ GitUI is in beta and may contain bugs and missing features. However, for persona
 ##### [Arch Linux](https://archlinux.org/packages/extra/x86_64/gitui/)
 
 ```sh
-pacman -S gitui
+sudo pacman -S gitui
 ```
 
 ##### Fedora

asyncgit/src/sync/config.rs

@@ -1,9 +1,8 @@
-use std::str::FromStr;
-
 use crate::error::Result;
 use git2::Repository;
 use scopetime::scope_time;
 use serde::{Deserialize, Serialize};
+use std::str::FromStr;
 
 use super::{repository::repo, RepoPath};
 
@@ -77,7 +76,6 @@ pub enum PushDefaultStrategyConfig {
 
 impl FromStr for PushDefaultStrategyConfig {
 	type Err = crate::Error;
-
 	fn from_str(value: &str) -> std::result::Result<Self, Self::Err> {
 		match value {
 			"nothing" => Ok(Self::Nothing),
@@ -97,9 +95,7 @@ pub fn push_default_strategy_config_repo(
 ) -> Result<PushDefaultStrategyConfig> {
 	(get_config_string_repo(repo, "push.default")?).map_or_else(
 		|| Ok(PushDefaultStrategyConfig::default()),
-		|entry_str| {
-			PushDefaultStrategyConfig::from_str(entry_str.as_str())
-		},
+		|entry_str| entry_str.parse(),
 	)
 }