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

add test for (#118)

Browse source
This commit is contained in:
Stephan Dilly 2020-06-12 13:17:06 +02:00
parent 7c0fe181fb
commit fdd84a8692
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,7 +56,6 @@ pub fn reset_workdir_file(repo_path: &str, path: &str) -> Result<()> {
let mut checkout_opts = CheckoutBuilder::new(); let mut checkout_opts = CheckoutBuilder::new();
checkout_opts checkout_opts
.update_index(true) // windows: needs this to be true WTF?! .update_index(true) // windows: needs this to be true WTF?!
.allow_conflicts(true)
.force() .force()
.path(path); .path(path);
@ -76,7 +75,6 @@ pub fn reset_workdir_folder(
let mut checkout_opts = CheckoutBuilder::new(); let mut checkout_opts = CheckoutBuilder::new();
checkout_opts checkout_opts
.update_index(true) // windows: needs this to be true WTF?! .update_index(true) // windows: needs this to be true WTF?!
.allow_conflicts(true)
.remove_untracked(true) .remove_untracked(true)
.force() .force()
.path(path); .path(path);
@ -334,4 +332,29 @@ mod tests {
assert_eq!(get_statuses(repo_path), (0, 0)); assert_eq!(get_statuses(repo_path), (0, 0));
} }
#[test]
fn test_reset_untracked_subdir() {
let (_td, repo) = repo_init().unwrap();
let root = repo.path().parent().unwrap();
let repo_path = root.as_os_str().to_str().unwrap();
{
fs::create_dir_all(&root.join("foo/bar")).unwrap();
File::create(&root.join("foo/bar/baz.txt"))
.unwrap()
.write_all(b"test\nfoo")
.unwrap();
}
debug_cmd_print(repo_path, "git status");
assert_eq!(get_statuses(repo_path), (1, 0));
reset_workdir_folder(repo_path, "foo/bar").unwrap();
debug_cmd_print(repo_path, "git status");
assert_eq!(get_statuses(repo_path), (0, 0));
}
} }