mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: make ya pkg ignore default remote name in user Git config (#3648)

Browse source
This commit is contained in:
sxyazi 2026-01-31 18:43:25 +08:00
parent a015d4a7ef
commit 339002ee48
No known key found for this signature in database
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/):
### Fixed ### Fixed
- Archive extraction fails for target paths with non-ASCII characters on Windows ([#3607]) - Archive extraction fails for target paths with non-ASCII characters on Windows ([#3607])
- Make `ya pkg` ignore default remote name in user Git config ([#3648])
### Improved ### Improved
@ -1638,3 +1639,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/):
[#3634]: https://github.com/sxyazi/yazi/pull/3634 [#3634]: https://github.com/sxyazi/yazi/pull/3634
[#3638]: https://github.com/sxyazi/yazi/pull/3638 [#3638]: https://github.com/sxyazi/yazi/pull/3638
[#3642]: https://github.com/sxyazi/yazi/pull/3642 [#3642]: https://github.com/sxyazi/yazi/pull/3642
[#3648]: https://github.com/sxyazi/yazi/pull/3648

9
yazi-cli/src/package/git.rs
View file

@ -43,7 +43,14 @@ impl Git {
} }
async fn exec(f: impl FnOnce(&mut Command) -> &mut Command) -> Result<()> { async fn exec(f: impl FnOnce(&mut Command) -> &mut Command) -> Result<()> {
let status = f(Command::new("git").args(["-c", "advice.detachedHead=false"])) let status = f(Command::new("git").args([
"-c",
"advice.detachedHead=false",
"-c",
"checkout.defaultRemote=origin",
"-c",
"clone.defaultRemoteName=origin",
]))
.status() .status()
.await .await
.context("Failed to execute `git` command")?; .context("Failed to execute `git` command")?;

1
yazi-parser/src/notify/push.rs
View file

@ -12,6 +12,7 @@ use yazi_shared::event::CmdCow;
pub struct PushOpt { pub struct PushOpt {
pub title: String, pub title: String,
pub content: String, pub content: String,
#[serde(default)]
pub level: PushLevel, pub level: PushLevel,
#[serde_as(as = "DurationSecondsWithFrac<f64>")] #[serde_as(as = "DurationSecondsWithFrac<f64>")]
pub timeout: Duration, pub timeout: Duration,