Compare commits
2 commits
64542f66fa
...
cde9531150
Author | SHA1 | Date | |
---|---|---|---|
cde9531150 | |||
a259fd3552 |
3 changed files with 5 additions and 0 deletions
|
@ -7,6 +7,7 @@ members = [
|
||||||
"crates/git",
|
"crates/git",
|
||||||
"crates/forge",
|
"crates/forge",
|
||||||
"crates/forge-forgejo",
|
"crates/forge-forgejo",
|
||||||
|
"crates/forge-github",
|
||||||
"crates/repo-actor",
|
"crates/repo-actor",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -26,6 +27,7 @@ git-next-config = { path = "crates/config" }
|
||||||
git-next-git = { path = "crates/git" }
|
git-next-git = { path = "crates/git" }
|
||||||
git-next-forge = { path = "crates/forge" }
|
git-next-forge = { path = "crates/forge" }
|
||||||
git-next-forge-forgejo = { path = "crates/forge-forgejo" }
|
git-next-forge-forgejo = { path = "crates/forge-forgejo" }
|
||||||
|
git-next-forge-github = { path = "crates/forge-github" }
|
||||||
git-next-repo-actor = { path = "crates/repo-actor" }
|
git-next-repo-actor = { path = "crates/repo-actor" }
|
||||||
|
|
||||||
# CLI parsing
|
# CLI parsing
|
||||||
|
|
|
@ -204,6 +204,8 @@ async fn get_commit_history(
|
||||||
info!("new version matches");
|
info!("new version matches");
|
||||||
Ok(updated)
|
Ok(updated)
|
||||||
} else {
|
} else {
|
||||||
|
// FIXME: log original and updated on seperate log lines - can't find where one ends and
|
||||||
|
// the other beings!
|
||||||
error!(?updated, ?original, "new version doesn't match original");
|
error!(?updated, ?original, "new version doesn't match original");
|
||||||
Ok(original)
|
Ok(original)
|
||||||
}
|
}
|
||||||
|
|
|
@ -111,6 +111,7 @@ impl super::OpenRepositoryLike for RealOpenRepository {
|
||||||
branch_name: &config::BranchName,
|
branch_name: &config::BranchName,
|
||||||
find_commits: &[git::Commit],
|
find_commits: &[git::Commit],
|
||||||
) -> Result<Vec<crate::Commit>, git::commit::log::Error> {
|
) -> Result<Vec<crate::Commit>, git::commit::log::Error> {
|
||||||
|
// FIXME: only finds 'main', does it need to prefix branch_name with 'origin/'?
|
||||||
self.0
|
self.0
|
||||||
.lock()
|
.lock()
|
||||||
.map_err(|_| git::commit::log::Error::Lock)
|
.map_err(|_| git::commit::log::Error::Lock)
|
||||||
|
|
Loading…
Reference in a new issue