fix ahead-behind

minor bump
ChrisDavison · Feb 23, 2024 · 3255337 · 3255337
1 parent 390076c
commit 3255337
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "repoutil"
-version = "0.25.0"
+version = "0.26.0"
 authors = ["Chris Davison <c.jr.davison@gmail.com>"]
 edition = "2018"
 license = "MIT"

diff --git a/src/git.rs b/src/git.rs
@@ -71,16 +71,14 @@ pub fn stat(p: &Path, as_json: bool) -> Result<Option<String>> {
 fn ahead_behind(p: &Path) -> Result<Option<String>> {
     let response: String = command_output(
         p,
-        "for-each-ref --format='%(refname:short) %(upstream:track)' refs/heads",
-    )?
-    .iter()
-    .map(|x| x.trim_matches('\'').trim())
-    .filter(|x| x.split(' ').nth(1).is_some())
-    .collect();
+        "status --porcelain --ahead-behind -b",
+    )?.into_iter().next().filter(|x| x.contains("[")).unwrap_or(String::new());
     Ok(if response.is_empty() {
         None
     } else {
-        Some(response)
+        let start = response.find('[').unwrap();
+        let end = response.find(']').unwrap();
+        Some(response[start + 1..end].to_string())
     })
 }