Merge pull request jesseduffield#2218 from Ryooooooga/feature/empty-stash-message

jesseduffield · web-flow · commit 6cb5e628b3b0 · 2022-10-13T17:46:13.000-07:00
diff --git a/pkg/commands/loaders/stash.go b/pkg/commands/loaders/stash.go
@@ -65,8 +65,8 @@ outer:
 }
 
 func (self *StashLoader) getUnfilteredStashEntries() []*models.StashEntry {
-	rawString, _ := self.cmd.New("git stash list --pretty='%gs'").DontLog().RunWithOutput()
-	return slices.MapWithIndex(utils.SplitLines(rawString), func(line string, index int) *models.StashEntry {
+	rawString, _ := self.cmd.New("git stash list -z --pretty='%gs'").DontLog().RunWithOutput()
+	return slices.MapWithIndex(utils.SplitNul(rawString), func(line string, index int) *models.StashEntry {
 		return self.stashEntryFromLine(line, index)
 	})
 }
diff --git a/pkg/commands/loaders/stash_test.go b/pkg/commands/loaders/stash_test.go
@@ -22,16 +22,16 @@ func TestGetStashEntries(t *testing.T) {
 			"No stash entries found",
 			"",
 			oscommands.NewFakeRunner(t).
-				Expect(`git stash list --pretty='%gs'`, "", nil),
+				Expect(`git stash list -z --pretty='%gs'`, "", nil),
 			[]*models.StashEntry{},
 		},
 		{
 			"Several stash entries found",
 			"",
 			oscommands.NewFakeRunner(t).
 				Expect(
-					`git stash list --pretty='%gs'`,
-					"WIP on add-pkg-commands-test: 55c6af2 increase parallel build\nWIP on master: bb86a3f update github template",
+					`git stash list -z --pretty='%gs'`,
+					"WIP on add-pkg-commands-test: 55c6af2 increase parallel build\x00WIP on master: bb86a3f update github template\x00",
 					nil,
 				),
 			[]*models.StashEntry{
diff --git a/pkg/utils/lines.go b/pkg/utils/lines.go
@@ -17,6 +17,14 @@ func SplitLines(multilineString string) []string {
 	return lines
 }
 
+func SplitNul(str string) []string {
+	if str == "" {
+		return make([]string, 0)
+	}
+	str = strings.TrimSuffix(str, "\x00")
+	return strings.Split(str, "\x00")
+}
+
 // NormalizeLinefeeds - Removes all Windows and Mac style line feeds
 func NormalizeLinefeeds(str string) string {
 	str = strings.Replace(str, "\r\n", "\n", -1)
diff --git a/pkg/utils/lines_test.go b/pkg/utils/lines_test.go
@@ -36,6 +36,37 @@ func TestSplitLines(t *testing.T) {
 	}
 }
 
+func TestSplitNul(t *testing.T) {
+	type scenario struct {
+		multilineString string
+		expected        []string
+	}
+
+	scenarios := []scenario{
+		{
+			"",
+			[]string{},
+		},
+		{
+			"\x00",
+			[]string{
+				"",
+			},
+		},
+		{
+			"hello world !\x00hello universe !\x00",
+			[]string{
+				"hello world !",
+				"hello universe !",
+			},
+		},
+	}
+
+	for _, s := range scenarios {
+		assert.EqualValues(t, s.expected, SplitNul(s.multilineString))
+	}
+}
+
 // TestNormalizeLinefeeds is a function.
 func TestNormalizeLinefeeds(t *testing.T) {
 	type scenario struct {

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,8 @@ outer:`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`func (self StashLoader) getUnfilteredStashEntries() []models.StashEntry {`
`68`		`- rawString, _ := self.cmd.New("git stash list --pretty='%gs'").DontLog().RunWithOutput()`
`69`		`- return slices.MapWithIndex(utils.SplitLines(rawString), func(line string, index int) *models.StashEntry {`
	`68`	`+ rawString, _ := self.cmd.New("git stash list -z --pretty='%gs'").DontLog().RunWithOutput()`
	`69`	`+ return slices.MapWithIndex(utils.SplitNul(rawString), func(line string, index int) *models.StashEntry {`
`70`	`70`	`return self.stashEntryFromLine(line, index)`
`71`	`71`	`})`
`72`	`72`	`}`