Skip to content

Fix commting with one stack #7902

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
merged 2 commits into from
Apr 1, 2025
Merged

Fix commting with one stack #7902

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0714310
Fix commting with one stack
Caleb-T-Owens Mar 31, 2025
0115d53
upgrade gix to the latest version
Byron Mar 30, 2025
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: 0 additions & 8 deletions crates/but-workspace/src/commit_engine/reference_frame.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@ impl ReferenceFrame {
) -> anyhow::Result<Self> {
let head_id = repo.head_id()?;
let workspace_commit = head_id.object()?.into_commit().decode()?.to_owned();
if workspace_commit.parents.len() < 2 {
return Ok(crate::commit_engine::ReferenceFrame {
workspace_tip: Some(head_id.detach()),
// The workspace commit is never the tip
#[allow(clippy::indexing_slicing)]
branch_tip: Some(workspace_commit.parents[0]),
});
}

let cache = repo.commit_graph_if_enabled()?;
let mut graph = repo.revision_graph(cache.as_ref());
Expand Down
Loading