summaryrefslogtreecommitdiff
path: root/crates/git-tracker/src/tracker.rs
diff options
context:
space:
mode:
authorseth <[email protected]>2024-08-16 22:14:16 -0400
committerGitHub <[email protected]>2024-08-17 02:14:16 +0000
commitbbc00edc6508ea1910c4d9e6a272f7859900950d (patch)
tree538fe23940cb6bca8afa48059e502bfa7d5608cd /crates/git-tracker/src/tracker.rs
parent66ea6f8c225cc2273cfbfb1b948604c170a78e8c (diff)
end of summer refactor (#31)
* crates: `bot-*` -> `discord-bot` I didn't really need all these crates to be split :/ * discord-bot: revamp http impl also handles the new errors reported by teawieAPI * crates: split http backend this can be reused easily * git-tracker: short-circuit boolean logic We don't need to check if the commit is a descendant of the HEAD of the branch if it *is* the HEAD * nix: fenix -> nixpkgs * treefmt: add actionlint * nix: use docker arch names for containers * ci: use actions-rust-lang actions * nix: drop ci dev shell * git-tracker: init ManagedRepository this logic can be shared * ci: use nix for clippy scan * discord-bot: better handle unmerged PRs * ci: fix treefmt check * nix: fix clippy check * .env.template: update crate names * git-tracker: use remote name for remote name i was half asleep * discord-bot: handle merged PRs that aren't found in any tracked branches * git-tracker: make collect_statuses_in() return a Vec * discord-bot: add more PR info with response fixes #18
Diffstat (limited to 'crates/git-tracker/src/tracker.rs')
-rw-r--r--crates/git-tracker/src/tracker.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/git-tracker/src/tracker.rs b/crates/git-tracker/src/tracker.rs
index e26f82d..e6a3f54 100644
--- a/crates/git-tracker/src/tracker.rs
+++ b/crates/git-tracker/src/tracker.rs
@@ -2,6 +2,11 @@ use std::path::Path;
use git2::{Branch, BranchType, Commit, ErrorCode, Oid, Reference, Repository};
+/// Helper struct for tracking Git objects
+pub struct Tracker {
+ repository: Repository,
+}
+
#[derive(Debug, thiserror::Error)]
pub enum Error {
#[error("libgit2 error")]
@@ -10,11 +15,6 @@ pub enum Error {
RepositoryPathNotFound(String),
}
-/// Helper struct for tracking Git objects
-pub struct Tracker {
- repository: Repository,
-}
-
impl Tracker {
/// Create a new [`Tracker`] using the repository at [`path`]
///
@@ -76,7 +76,7 @@ impl Tracker {
.repository
.graph_descendant_of(head.id(), commit.id())?;
- Ok(has_commit || is_head)
+ Ok(is_head || has_commit)
}
/// Check if a [`Branch`] named [`branch_name`] has a commit with the SHA [`commit_sha`]