mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-16 00:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

git: don't detach head if the ref already points to the right place

Browse source 
The first time we export to Git, we don't actually export
anything. That's a little weird and I don't know why I did it that
way. It seems more natural to export the current state. I'd like to
change it to do that. However, that currently means we'll detach the
current HEAD if it points to any of the branches we export. This patch
restructures the code a bit and skips the detach step if the target
branch already points to the right commit.
This commit is contained in:
Martin von Zweigbergk 2022-10-31 10:00:44 -07:00 committed by Martin von Zweigbergk
parent f3f41cc2cc
commit 2172887876
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/src/git.rs
View file

@ -182,14 +182,6 @@ pub fn export_changes(
) -> Result<(), GitExportError> { ) -> Result<(), GitExportError> {
let old_branches: HashSet<_> = old_view.branches().keys().cloned().collect(); let old_branches: HashSet<_> = old_view.branches().keys().cloned().collect();
let new_branches: HashSet<_> = new_view.branches().keys().cloned().collect(); let new_branches: HashSet<_> = new_view.branches().keys().cloned().collect();
// TODO: Check that the ref is not pointed to by any worktree's HEAD.
let mut active_branches = HashSet::new();
if let Ok(head_ref) = git_repo.find_reference("HEAD") {
if let Some(head_target) = head_ref.symbolic_target() {
active_branches.insert(head_target.to_string());
}
}
let mut detach_head = false;
// First find the changes we want need to make and then make them all at once to // First find the changes we want need to make and then make them all at once to
// reduce the risk of making some changes before we fail. // reduce the risk of making some changes before we fail.
let mut refs_to_update = BTreeMap::new(); let mut refs_to_update = BTreeMap::new();
@ -216,13 +208,18 @@ pub fn export_changes(
} else { } else {
refs_to_delete.insert(git_ref_name.clone()); refs_to_delete.insert(git_ref_name.clone());
} }
if active_branches.contains(&git_ref_name) {
detach_head = true;
} }
} // TODO: Also check other worktrees' HEAD.
if detach_head {
if let Ok(head_ref) = git_repo.find_reference("HEAD") { if let Ok(head_ref) = git_repo.find_reference("HEAD") {
if let Ok(current_git_commit) = head_ref.peel_to_commit() { if let (Some(head_target), Ok(current_git_commit)) =
(head_ref.symbolic_target(), head_ref.peel_to_commit())
{
let detach_head = if let Some(new_target) = refs_to_update.get(head_target) {
*new_target != current_git_commit.id()
} else {
refs_to_delete.contains(head_target)
};
if detach_head {
git_repo.set_head_detached(current_git_commit.id())?; git_repo.set_head_detached(current_git_commit.id())?;
} }
} }