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

Merge pull request #31 from arxanas/test-default-branch

Browse source 
git: properly detect default branch
This commit is contained in:
Martin von Zweigbergk 2021-09-22 20:54:18 -07:00 committed by GitHub
commit 0711757324
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/tests/test_git.rs
View file

@ -285,6 +285,7 @@ fn test_fetch_success() {
let jj_repo_dir = temp_dir.path().join("jj"); let jj_repo_dir = temp_dir.path().join("jj");
let source_git_repo = git2::Repository::init_bare(&source_repo_dir).unwrap(); let source_git_repo = git2::Repository::init_bare(&source_repo_dir).unwrap();
let initial_git_commit = empty_git_commit(&source_git_repo, "refs/heads/main", &[]); let initial_git_commit = empty_git_commit(&source_git_repo, "refs/heads/main", &[]);
source_git_repo.set_head("refs/heads/main").unwrap();
let clone_git_repo = let clone_git_repo =
git2::Repository::clone(source_repo_dir.to_str().unwrap(), &clone_repo_dir).unwrap(); git2::Repository::clone(source_repo_dir.to_str().unwrap(), &clone_repo_dir).unwrap();
std::fs::create_dir(&jj_repo_dir).unwrap(); std::fs::create_dir(&jj_repo_dir).unwrap();
@ -301,10 +302,9 @@ fn test_fetch_success() {
.contains(&commit_id(&new_git_commit))); .contains(&commit_id(&new_git_commit)));
let mut tx = jj_repo.start_transaction("test"); let mut tx = jj_repo.start_transaction("test");
let _default_branch = git::fetch(tx.mut_repo(), &clone_git_repo, "origin").unwrap(); let default_branch = git::fetch(tx.mut_repo(), &clone_git_repo, "origin").unwrap();
// The default branch is "main" // The default branch is "main"
// TODO: Figure out why this is unreliable. Issue #30. assert_eq!(default_branch, Some("main".to_string()));
//assert_eq!(default_branch, Some("main".to_string()));
let repo = tx.commit(); let repo = tx.commit();
// The new commit is visible after git::fetch(). // The new commit is visible after git::fetch().
assert!(repo.view().heads().contains(&commit_id(&new_git_commit))); assert!(repo.view().heads().contains(&commit_id(&new_git_commit)));