Skip to content

Commit 8776a3e

Browse files
authored
Merge pull request #1857 from GitoxideLabs/fixes
thanks clippy
2 parents 16a248b + 9dcfd15 commit 8776a3e

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

gix-ref/src/store/file/find.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -234,17 +234,17 @@ impl file::Store {
234234
}
235235
Tag | LocalBranch | RemoteBranch | Note => (commondir.into(), name),
236236
MainRef | MainPseudoRef => (commondir.into(), sn),
237-
LinkedRef { name: worktree_name } => sn
238-
.category()
239-
.is_some_and(|cat| cat.is_worktree_private())
240-
.then(|| {
237+
LinkedRef { name: worktree_name } => {
238+
if sn.category().is_some_and(|cat| cat.is_worktree_private()) {
241239
if is_reflog {
242240
(linked_git_dir(worktree_name).into(), sn)
243241
} else {
244242
(commondir.into(), name)
245243
}
246-
})
247-
.unwrap_or((commondir.into(), sn)),
244+
} else {
245+
(commondir.into(), sn)
246+
}
247+
}
248248
PseudoRef | Bisect | Rewritten | WorktreePrivate => (self.git_dir.as_path().into(), name),
249249
}
250250
})

gix-traverse/src/commit/simple.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ mod init {
222222
/// Create a new instance with commit filtering enabled.
223223
///
224224
/// * `find` - a way to lookup new object data during traversal by their `ObjectId`, writing their data into buffer and returning
225-
/// an iterator over commit tokens if the object is present and is a commit. Caching should be implemented within this function
226-
/// as needed.
225+
/// an iterator over commit tokens if the object is present and is a commit. Caching should be implemented within this function
226+
/// as needed.
227227
/// * `tips`
228228
/// * the starting points of the iteration, usually commits
229229
/// * each commit they lead to will only be returned once, including the tip that started it

0 commit comments

Comments
 (0)