Skip to content

fix: #9

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
devopsariful merged 3 commits into from
Jul 22, 2026
Merged

fix: #9

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
195ac6f
Merge pull request #7 from devopsariful/codex/fix-typo-in-codebase
devopsariful Jul 22, 2026
92aaa15
fix ci dependency specs and rust git api
devopsariful Jul 22, 2026
4f165b6
Merge pull request #8 from devopsariful/codex/fix-typo-in-codebase-6s…
devopsariful Jul 22, 2026
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
13 changes: 8 additions & 5 deletions src-tauri/src/git/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ impl GitEngine {
))?;

for entry in statuses.iter() {
if let Some(path) = entry.path() {
if let Ok(path) = entry.path() {
let _ = index.add_path(Path::new(path));
}
}
Expand Down Expand Up @@ -198,7 +198,7 @@ impl GitEngine {

let mut unstaged = Vec::new();
for entry in statuses.iter() {
if let Some(path) = entry.path() {
if let Ok(path) = entry.path() {
unstaged.push(path.to_string());
}
}
Expand All @@ -207,15 +207,18 @@ impl GitEngine {
let behind = 0;

if let Ok(head) = repo.head() {
let head_oid = head.peel_to_commit().map(|c| c.id()).unwrap_or(Oid::zero());
if let Some(branch_name) = head.shorthand() {
let head_oid = head
.peel_to_commit()
.map(|c| c.id())
.unwrap_or(Oid::ZERO_SHA1);
if let Ok(branch_name) = head.shorthand() {
if let Ok(branch) = repo.find_branch(branch_name, git2::BranchType::Local) {
if let Ok(upstream) = branch.upstream() {
let upstream_oid = upstream
.get()
.peel_to_commit()
.map(|c| c.id())
.unwrap_or(Oid::zero());
.unwrap_or(Oid::ZERO_SHA1);

let mut revwalk = repo.revwalk()?;
revwalk.push(upstream_oid)?;
Expand Down