gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-19 07:32:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3142 from gitbutlerapp/robust-alternates-writing

Browse Source 
make the alternates path writing more robust
This commit is contained in:
Josh Junon 2024-03-14 10:47:58 +01:00 committed by GitHub
commit 5d6491f482
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gitbutler-app/src/git/repository.rs
View File

@ -1,9 +1,13 @@
use std::{path, str}; use std::{
io::Write,
path::{self, Path},
str,
};
use git2::Submodule; use git2::Submodule;
use git2_hooks::HookResult; use git2_hooks::HookResult;
use crate::keys; use crate::{keys, path::Normalize};
use super::{ use super::{
Blob, Branch, Commit, Config, Index, Oid, Reference, Refname, Remote, Result, Signature, Tree, Blob, Branch, Commit, Config, Index, Oid, Reference, Refname, Remote, Result, Signature, Tree,
@ -50,10 +54,13 @@ impl Repository {
Ok(Repository(inner)) Ok(Repository(inner))
} }
pub fn add_disk_alternate(&self, path: &str) -> Result<()> { pub fn add_disk_alternate<P: AsRef<Path>>(&self, path: P) -> Result<()> {
let alternates_path = self.0.path().join("objects/info/alternates"); let alternates_path = self.0.path().join("objects/info/alternates");
if !alternates_path.exists() { if !alternates_path.exists() {
std::fs::write(alternates_path, format!("{path}\n"))?; let path = path.as_ref().normalize();
let mut alternates_file = std::fs::File::create(&alternates_path)?;
alternates_file.write_all(path.as_path().as_os_str().as_encoded_bytes())?;
alternates_file.write_all(b"\n")?;
self.0.odb().and_then(|odb| odb.refresh())?; self.0.odb().and_then(|odb| odb.refresh())?;
} }