Skip to content

fix: search latest head by change id instead of commit id #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Cretezy merged 1 commit into from
Feb 15, 2025
Merged

fix: search latest head by change id instead of commit id #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/commander/log.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,13 @@ impl Commander {
// Check obslog for each head. If the obslog contains the head's commit, it means
// there's a new commit for the head
for latest_head in latest_heads.iter() {
let parent_commits: Vec<CommitId> = self
let parent_commits: Vec<ChangeId> = self
.execute_jj_command(
vec![
"obslog",
"--no-graph",
"--template",
r#"commit_id ++ "\n""#,
r#"change_id ++ "\n""#,
"-r",
&latest_head.commit_id.as_str(),
],
Expand All @@ -209,12 +209,12 @@ impl Commander {
)
.context("Failed getting latest head parent commits")?
.lines()
.map(|line| CommitId(line.to_owned()))
.map(|line| ChangeId(line.to_owned()))
.collect();

if parent_commits
.iter()
.any(|parent_commit| parent_commit == &head.commit_id)
.any(|parent_commit| parent_commit == &head.change_id)
{
return Ok(latest_head.to_owned());
}
Expand Down