Added GIT pull before commit, fix

bpineau · Feb 4, 2019 · 49966fd · 49966fd
1 parent a25bde4
commit 49966fd
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pkg/store/git/git.go b/pkg/store/git/git.go
@@ -199,11 +199,6 @@ func (s *Store) Commit() (changed bool, err error) {
 		return false, nil
 	}
 
-	err = s.Git("pull", "-s", "recursive", "-X", "ours")
-	if err != nil {
-		return false, fmt.Errorf("failed to git pull -s recursive -X ours: %v", err)
-	}
-
 	err = s.Git("add", "-A")
 	if err != nil {
 		return false, fmt.Errorf("failed to git add -A: %v", err)
@@ -237,6 +232,11 @@ func (s *Store) commitAndPush() {
 		return
 	}
 
+	err = s.Git("pull", "-s", "recursive", "-X", "ours", "--no-edit")
+	if err != nil {
+		return false, fmt.Errorf("failed to git pull -s recursive -X ours --no-edit: %v", err)
+	}
+
 	err = s.Push()
 	if err != nil {
 		s.Logger.Errorf("%v", err)