ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

test_import_refs_reimport: very minor improvement to a test

Browse source
This commit is contained in:
Ilya Grigoriev 2023-05-08 12:54:37 -07:00
parent 07e7b82a0d
commit bda3d3e50b
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/tests/test_git.rs
View file

@ -183,7 +183,7 @@ fn test_import_refs_reimport() {
let commit1 = empty_git_commit(&git_repo, "refs/heads/main", &[]);
git_ref(&git_repo, "refs/remotes/origin/main", commit1.id());
let commit2 = empty_git_commit(&git_repo, "refs/heads/main", &[&commit1]);
let _commit3 = empty_git_commit(&git_repo, "refs/heads/feature1", &[&commit2]);
let commit3 = empty_git_commit(&git_repo, "refs/heads/feature1", &[&commit2]);
let commit4 = empty_git_commit(&git_repo, "refs/heads/feature2", &[&commit2]);
let pgp_key_oid = git_repo.blob(b"my PGP key").unwrap();
git_repo
@ -195,6 +195,13 @@ fn test_import_refs_reimport() {
tx.mut_repo().rebase_descendants(&settings).unwrap();
let repo = tx.commit();
let expected_heads = hashset! {
jj_id(&commit3),
jj_id(&commit4),
};
let view = repo.view();
assert_eq!(*view.heads(), expected_heads);
// Delete feature1 and rewrite feature2
delete_git_ref(&git_repo, "refs/heads/feature1");
delete_git_ref(&git_repo, "refs/heads/feature2");