Elgato_dark/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui synced 2026-05-23 17:08:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix crash when unstaging file in empty repo

Browse source
This commit is contained in:
Stephan Dilly 2020-04-05 19:30:59 +02:00
parent 6392778c09
commit b4f10c06ac
1 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
asyncgit/src/sync/reset.rs
View file

@ -9,19 +9,20 @@ pub fn reset_stage(repo_path: &str, path: &Path) -> bool {
let repo = repo(repo_path);
let reference = repo.head().unwrap();
let obj = repo
.find_object(
reference.target().unwrap(),
Some(ObjectType::Commit),
)
.unwrap();
let head = repo.head();
if repo.reset_default(Some(&obj), &[path]).is_ok() {
return true;
if let Ok(reference) = head {
let obj = repo
.find_object(
reference.target().unwrap(),
Some(ObjectType::Commit),
)
.unwrap();
repo.reset_default(Some(&obj), &[path]).is_ok()
} else {
repo.reset_default(None, &[path]).is_ok()
}
false
}
///
@ -60,10 +61,10 @@ pub fn reset_workdir(repo_path: &str, path: &Path) -> bool {
#[cfg(test)]
mod tests {
use super::reset_workdir;
use super::{reset_stage, reset_workdir};
use crate::sync::{
status::{get_status, StatusType},
tests::{debug_cmd_print, repo_init},
tests::{debug_cmd_print, repo_init, repo_init_empty},
utils::stage_add,
};
use std::{
@ -229,4 +230,21 @@ mod tests {
);
assert_eq!(get_status(repo_path, StatusType::Stage).len(), 1);
}
#[test]
fn unstage_in_empty_repo() {
let file_path = Path::new("foo.txt");
let (_td, repo) = repo_init_empty();
let root = repo.path().parent().unwrap();
let repo_path = root.as_os_str().to_str().unwrap();
File::create(&root.join(file_path))
.unwrap()
.write_all(b"test\nfoo")
.unwrap();
assert_eq!(stage_add(repo_path, file_path), true);
assert_eq!(reset_stage(repo_path, file_path), true);
}
}