Skip to content

thanks clippy #1857

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.

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 1 commit into from
Feb 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions gix-ref/src/store/file/find.rs
Original file line number Diff line number Diff line change
Expand Up @@ -234,17 +234,17 @@ impl file::Store {
}
Tag | LocalBranch | RemoteBranch | Note => (commondir.into(), name),
MainRef | MainPseudoRef => (commondir.into(), sn),
LinkedRef { name: worktree_name } => sn
.category()
.is_some_and(|cat| cat.is_worktree_private())
.then(|| {
LinkedRef { name: worktree_name } => {
if sn.category().is_some_and(|cat| cat.is_worktree_private()) {
if is_reflog {
(linked_git_dir(worktree_name).into(), sn)
} else {
(commondir.into(), name)
}
})
.unwrap_or((commondir.into(), sn)),
} else {
(commondir.into(), sn)
}
}
PseudoRef | Bisect | Rewritten | WorktreePrivate => (self.git_dir.as_path().into(), name),
}
})
Expand Down
4 changes: 2 additions & 2 deletions gix-traverse/src/commit/simple.rs
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@ mod init {
/// Create a new instance with commit filtering enabled.
///
/// * `find` - a way to lookup new object data during traversal by their `ObjectId`, writing their data into buffer and returning
/// an iterator over commit tokens if the object is present and is a commit. Caching should be implemented within this function
/// as needed.
/// an iterator over commit tokens if the object is present and is a commit. Caching should be implemented within this function
/// as needed.
/// * `tips`
/// * the starting points of the iteration, usually commits
/// * each commit they lead to will only be returned once, including the tip that started it
Expand Down
Loading