diff --git a/pkg/gui/command_log_panel.go b/pkg/gui/command_log_panel.go index ee6b2ae52..be9fdc5b3 100644 --- a/pkg/gui/command_log_panel.go +++ b/pkg/gui/command_log_panel.go @@ -119,9 +119,6 @@ func gitOutputLinesAfterHeader(lines []string, startIdx int, gitOutputHeader str if isCopyToClipboardLogLine(line) { continue } - if strings.HasPrefix(line, " ") { - continue - } if isStartOfNewCommandLogEntry(lines, i) { break } diff --git a/pkg/gui/command_log_panel_test.go b/pkg/gui/command_log_panel_test.go index 6ab059930..3d2074017 100644 --- a/pkg/gui/command_log_panel_test.go +++ b/pkg/gui/command_log_panel_test.go @@ -23,6 +23,21 @@ func TestGitOutputBlocksFromCommandLogLines(t *testing.T) { assert.Equal(t, []string{"Push\n git push\n\nGit output:\nline1\nline2"}, gitOutputBlocksFromCommandLogLines(lines, gitOutputHeader)) } +func TestGitOutputBlocksIncludeIndentedStderr(t *testing.T) { + t.Parallel() + + lines := []string{ + "Push", + " git push", + gitOutputHeader, + " at foo.go:10", + " at bar.go:20", + "hook failed", + } + + assert.Equal(t, []string{"Push\n git push\n\nGit output:\n at foo.go:10\n at bar.go:20\nhook failed"}, gitOutputBlocksFromCommandLogLines(lines, gitOutputHeader)) +} + func TestGitOutputBlocksSkipCopyNotifications(t *testing.T) { t.Parallel()