From 434cd41faf6e1df077b00f5b0305aedc77fe712f Mon Sep 17 00:00:00 2001
From: Jan De Dobbeleer <jan.de.dobbeleer@gmail.com>
Date: Mon, 12 Apr 2021 19:28:32 +0200
Subject: [PATCH] fix(git): move untracked to added

resolves #628
---
 src/segment_git.go      | 16 +++++++---------
 src/segment_git_test.go |  4 +---
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/segment_git.go b/src/segment_git.go
index 77a4b5fc8a0f..be7f98a8259a 100644
--- a/src/segment_git.go
+++ b/src/segment_git.go
@@ -19,12 +19,11 @@ type gitRepo struct {
 }
 
 type gitStatus struct {
-	unmerged  int
-	deleted   int
-	added     int
-	modified  int
-	untracked int
-	changed   bool
+	unmerged int
+	deleted  int
+	added    int
+	modified int
+	changed  bool
 }
 
 func (s *gitStatus) string() string {
@@ -38,7 +37,6 @@ func (s *gitStatus) string() string {
 	status += stringIfValue(s.added, "+")
 	status += stringIfValue(s.modified, "~")
 	status += stringIfValue(s.deleted, "-")
-	status += stringIfValue(s.untracked, "?")
 	status += stringIfValue(s.unmerged, "x")
 	return status
 }
@@ -384,7 +382,7 @@ func (g *git) parseGitStats(output []string, working bool) *gitStatus {
 		switch code {
 		case "?":
 			if working {
-				status.untracked++
+				status.added++
 			}
 		case "D":
 			status.deleted++
@@ -396,7 +394,7 @@ func (g *git) parseGitStats(output []string, working bool) *gitStatus {
 			status.modified++
 		}
 	}
-	status.changed = status.added > 0 || status.deleted > 0 || status.modified > 0 || status.unmerged > 0 || status.untracked > 0
+	status.changed = status.added > 0 || status.deleted > 0 || status.modified > 0 || status.unmerged > 0
 	return &status
 }
 
diff --git a/src/segment_git_test.go b/src/segment_git_test.go
index 3439d1ca64b8..e160398f74ea 100644
--- a/src/segment_git_test.go
+++ b/src/segment_git_test.go
@@ -352,9 +352,8 @@ func TestParseGitStatsWorking(t *testing.T) {
 	status := g.parseGitStats(output, true)
 	assert.Equal(t, 3, status.modified)
 	assert.Equal(t, 1, status.unmerged)
-	assert.Equal(t, 1, status.added)
+	assert.Equal(t, 3, status.added)
 	assert.Equal(t, 1, status.deleted)
-	assert.Equal(t, 2, status.untracked)
 	assert.True(t, status.changed)
 }
 
@@ -376,7 +375,6 @@ func TestParseGitStatsStaging(t *testing.T) {
 	assert.Equal(t, 0, status.unmerged)
 	assert.Equal(t, 1, status.added)
 	assert.Equal(t, 2, status.deleted)
-	assert.Equal(t, 0, status.untracked)
 	assert.True(t, status.changed)
 }