mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-07 04:51:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

working_copy: fix test to show that already tracked files are not ignored

Browse source 
The point of having the `modified` and `removed` files in the test was
to show that they don't get untracked, but I forgot to include them in
the `.gitignores`, so there was no reason they would have gotten
untracked anyway.
This commit is contained in:
Martin von Zweigbergk 2020-12-22 10:03:42 -08:00
parent 3b326a942c
commit c41251eaff
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/tests/test_working_copy.rs
View file

@ -282,7 +282,7 @@ fn test_gitignores(use_git: bool) {
let subdir_modified_path = FileRepoPath::from("dir/modified"); let subdir_modified_path = FileRepoPath::from("dir/modified");
let subdir_ignored_path = FileRepoPath::from("dir/ignored"); let subdir_ignored_path = FileRepoPath::from("dir/ignored");
testutils::write_working_copy_file(&repo, &gitignore_path, "ignored"); testutils::write_working_copy_file(&repo, &gitignore_path, "ignored\n");
testutils::write_working_copy_file(&repo, &modified_path, "1"); testutils::write_working_copy_file(&repo, &modified_path, "1");
testutils::write_working_copy_file(&repo, &removed_path, "1"); testutils::write_working_copy_file(&repo, &removed_path, "1");
std::fs::create_dir(repo.working_copy_path().join("dir")).unwrap(); std::fs::create_dir(repo.working_copy_path().join("dir")).unwrap();
@ -308,6 +308,7 @@ fn test_gitignores(use_git: bool) {
] ]
); );
testutils::write_working_copy_file(&repo, &gitignore_path, "ignored\nmodified\nremoved\n");
testutils::write_working_copy_file(&repo, &added_path, "2"); testutils::write_working_copy_file(&repo, &added_path, "2");
testutils::write_working_copy_file(&repo, &modified_path, "2"); testutils::write_working_copy_file(&repo, &modified_path, "2");
std::fs::remove_file( std::fs::remove_file(