From f00d7c0288595b1d30ee13a2ff13afb40a83e067 Mon Sep 17 00:00:00 2001 From: DataHearth Date: Mon, 27 Jun 2022 21:02:21 +0200 Subject: [PATCH] fix(git): use go-git for adding removed file (workaround) --- internal/git/git.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/internal/git/git.go b/internal/git/git.go index c8d95e1..a662649 100644 --- a/internal/git/git.go +++ b/internal/git/git.go @@ -3,7 +3,6 @@ package git import ( "errors" "os" - "os/exec" "time" "github.com/datahearth/config-mapper/internal/configuration" @@ -139,13 +138,18 @@ func (r *Repository) PushChanges(msg string, newLines, removedLines []string) er return err } - // TODO: investigated why w.AddWithOptions doesn't add removed files and sometimes .index - cmd := exec.Command("git", "add", ".") - cmd.Dir = r.repoPath - if err := cmd.Run(); err != nil { + status, err := w.Status() + if err != nil { return err } + for file := range status { + _, err = w.Add(file) + if err != nil { + return err + } + } + if _, err := w.Commit(msg, &git.CommitOptions{ Author: r.GetAuthor(), }); err != nil {