From b2c21e8c16f01d5b25736f7f4ec5a3419f94c999 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 15 Jan 2024 22:55:19 -0600 Subject: [PATCH] working on CheckDirty() Signed-off-by: Jeff Carr --- git.go | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/git.go b/git.go index e26141a..03b1e6e 100644 --- a/git.go +++ b/git.go @@ -89,16 +89,23 @@ func (rs *RepoStatus) getBranches() []string { } func (rs *RepoStatus) CheckDirty() bool { - out := run(rs.repopath, "git", "diff-index HEAD") - if out == "" { + cmd := []string{"git", "diff-index", "--quiet", "HEAD"} + err, b, out := RunCmd("/home/jcarr/go/src/" + rs.repopath, cmd) + if err != nil { + log.Warn("CheckDirty() err =", err) + log.Error(err, "CheckDirty() error") + rs.dirtyLabel.Set("error") + return true + } + log.Warn("CheckDirty() b =", b, "out =", out) + if b { log.Warn("CheckDirty() no", rs.repopath) rs.dirtyLabel.Set("no") return false - } else { - log.Warn("CheckDirty() true", rs.repopath) - rs.dirtyLabel.Set("dirty") - return true } + log.Warn("CheckDirty() true", rs.repopath) + rs.dirtyLabel.Set("dirty") + return true }