Skip to content

Fix status #8

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
jpninanjohn merged 2 commits into from
Dec 25, 2019
Merged

Fix status #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55fb57c
[Ninan] Handle directories that do not have remote HEAD's
leoOrion Dec 25, 2019
30398cd
[Ninan] Fix bug where status shows wrong number of commits behind
leoOrion Dec 25, 2019
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
30 changes: 16 additions & 14 deletions src/status.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,24 @@ impl<'a> GitAction for GitStatus<'a> {
};

// Adapted from @Kurt-Bonatz in https://github.com/rust-lang/git2-rs/issues/332#issuecomment-408453956
let head_ref = self.repo.revparse_single("HEAD").unwrap().id();
let (is_ahead, is_behind) = self.repo.revparse_ext("@{u}")
.ok()
.and_then(|(upstream, _)| self.repo.graph_ahead_behind(head_ref, upstream.id()).ok())
.unwrap_or((0, 0));
if self.repo.revparse_single("HEAD").is_ok() {
let head_ref = self.repo.revparse_single("HEAD").expect("HEAD not found").id();
let (is_ahead, is_behind) = self.repo.revparse_ext("@{u}")
.ok()
.and_then(|(upstream, _)| self.repo.graph_ahead_behind(head_ref, upstream.id()).ok())
.unwrap_or((0, 0));

if is_ahead > 0 {
let push_string = format!("{} ahead", is_ahead);
let push_string_colored = format!("{}", push_string.blue());
statuses_in_dir.push(push_string_colored);
}
if is_ahead > 0 {
let push_string = format!("{} ahead", is_ahead);
let push_string_colored = format!("{}", push_string.blue());
statuses_in_dir.push(push_string_colored);
}

if is_behind > 0 {
let push_string = format!("{} behind", is_ahead);
let push_string_colored = format!("{}", push_string.yellow());
statuses_in_dir.push(push_string_colored);
if is_behind > 0 {
let pull_string = format!("{} behind", is_behind);
let pull_string_colored = format!("{}", pull_string.yellow());
statuses_in_dir.push(pull_string_colored);
}
}

if statuses_in_dir.is_empty() {
Expand Down