Release 0.17.1 (#853)

Backport PRs to 0.17 branch:

- #830
- #831
- #852

Primarily, this is to release a bugfix that may fix #849,
but also pulling in other bugfixes while at it.

Author: abhinav

.changes/v0.17.1.md

@@ -0,0 +1,5 @@
+## <a name="v0.17.1">v0.17.1</a> - 2025-09-13
+### Fixed
+- log: When used without `--all`, query only requested branches internally. This was wasted work and slowed the command down in repositories with many branches.
+- log: List all tracked branches when run from an untracked branch or detached HEAD. Previously, this behavior was undefined.
+- Fix incorrect paths being logged when autostashed changes fail to reapply after a rebase operation.

.github/workflows/ci.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ '*' ]
   workflow_dispatch:
 
 concurrency:

CHANGELOG.md

@@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
+## <a name="v0.17.1">v0.17.1</a> - 2025-09-13
+### Fixed
+- log: When used without `--all`, query only requested branches internally. This was wasted work and slowed the command down in repositories with many branches.
+- log: List all tracked branches when run from an untracked branch or detached HEAD. Previously, this behavior was undefined.
+- Fix incorrect paths being logged when autostashed changes fail to reapply after a rebase operation.
+
 ## <a name="v0.17.0">v0.17.0</a> - 2025-08-25
 ### Added
 - submit: Add 'spice.submit.updateOnly' configuration option to default to --update-only for upstack, downstack, and stack submit operations.

doc/mise.lock

@@ -65,10 +65,7 @@ func (r *Repository) ensureLabels(ctx context.Context, labelNames []string) ([]g
 	// One query instead of many.
 	labelIDs := make([]githubv4.ID, len(labelNames)) // pre-allocate to fill without locking
 	for range runtime.GOMAXPROCS(0) {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-
+		wg.Go(func() {
 			for idx := range idxc {
 				labelName := labelNames[idx]
 
@@ -83,7 +80,7 @@ func (r *Repository) ensureLabels(ctx context.Context, labelNames []string) ([]g
 				r.log.Debug("Resolved label ID", "name", labelName, "id", labelID)
 				labelIDs[idx] = labelID
 			}
-		}()
+		})
 	}
 
 	for idx := range labelNames {

internal/forge/github/label.go

@@ -5,6 +5,8 @@ import (
 	"context"
 	"fmt"
 	"iter"
+
+	"go.abhg.dev/gs/internal/scanutil"
 )
 
 // ListFilesOptions shows information about files
@@ -18,15 +20,15 @@ type ListFilesOptions struct {
 // using the given options to filter.
 func (w *Worktree) ListFilesPaths(ctx context.Context, opts *ListFilesOptions) iter.Seq2[string, error] {
 	opts = cmp.Or(opts, &ListFilesOptions{})
-	args := []string{"ls-files", "--format=%(path)"}
+	args := []string{"ls-files", "-z", "--format=%(path)"}
 	if opts.Unmerged {
 		args = append(args, "--unmerged")
 	}
 
 	shown := make(map[string]struct{})
 	return func(yield func(string, error) bool) {
 		cmd := w.gitCmd(ctx, args...)
-		for line, err := range cmd.ScanLines(w.exec) {
+		for line, err := range cmd.Scan(w.exec, scanutil.SplitNull) {
 			if err != nil {
 				yield("", fmt.Errorf("git ls-files: %w", err))
 				continue

internal/git/files_wt.go

@@ -1,6 +1,7 @@
 package git_test
 
 import (
+	"runtime"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -101,3 +102,70 @@ func TestListFilesPaths_unmerged(t *testing.T) {
 		assert.Equal(t, []string{"conflict.txt"}, paths)
 	})
 }
+
+func TestListFilesPaths_specialCharacters(t *testing.T) {
+	t.Parallel()
+
+	// Windows doesn't like files with some of these names.
+	// Skip this test on Windows.
+	if runtime.GOOS == "windows" {
+		t.Skip("skipping test on Windows")
+	}
+
+	fixture, err := gittest.LoadFixtureScript([]byte(text.Dedent(`
+		as 'Test <[email protected]>'
+		at '2025-06-21T09:27:19Z'
+
+		git init
+		mv just-blank.txt ' '
+		git add ' '
+		git add *.txt
+		git commit -m 'Add files with special characters'
+
+		-- just-blank.txt --
+		file with a name that's just " ".
+
+		-- file with spaces.txt --
+		Contents with spaces
+
+		-- file"quotes".txt --
+		Contents with double quotes
+
+		-- file'single'.txt --
+		Contents with single quotes
+
+		-- file (parens).txt --
+		Contents with parentheses
+
+		-- file[brackets].txt --
+		Contents with brackets
+
+		-- file&ampersand.txt --
+		Contents with ampersand
+
+		-- файл.txt --
+		Unicode content
+	`)))
+	require.NoError(t, err)
+	t.Cleanup(fixture.Cleanup)
+
+	wt, err := git.OpenWorktree(t.Context(), fixture.Dir(), git.OpenOptions{
+		Log: silogtest.New(t),
+	})
+	require.NoError(t, err)
+
+	paths, err := sliceutil.CollectErr(wt.ListFilesPaths(t.Context(), nil))
+	require.NoError(t, err)
+
+	expected := []string{
+		"file with spaces.txt",
+		`file"quotes".txt`,
+		"file'single'.txt",
+		"file (parens).txt",
+		"file[brackets].txt",
+		"file&ampersand.txt",
+		"файл.txt",
+		" ",
+	}
+	assert.ElementsMatch(t, expected, paths)
+}

internal/git/files_wt_test.go

@@ -131,7 +131,7 @@ func (w *Worktree) Rebase(ctx context.Context, req RebaseRequest) (err error) {
 			w.log.Error("Dirty changes in the worktree were stashed, but could not be re-applied.")
 			w.log.Error("The following files were left unmerged:")
 			for _, file := range unmergedFiles {
-				w.log.Error("  - " + file)
+				w.log.Error("  - " + silog.MaybeQuote(file))
 			}
 			w.log.Error("Resolve the conflict and run 'git stash drop' to remove the stash entry.")
 			w.log.Error("Or change to a branch where the stash can apply, and run 'git stash pop'.")

internal/git/rebase_wt.go

@@ -24,15 +24,12 @@ func TestRepositoryListRemoteRefs(t *testing.T) {
 	mockExecer.EXPECT().
 		Start(gomock.Any()).
 		Do(func(cmd *exec.Cmd) error {
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
-
+			wg.Go(func() {
 				_, _ = io.WriteString(cmd.Stdout, "abc123\trefs/heads/main\n")
 				_, _ = io.WriteString(cmd.Stdout, "malformed entry is ignored\n")
 				_, _ = io.WriteString(cmd.Stdout, "def456\trefs/heads/feature\n")
 				assert.NoError(t, cmd.Stdout.(io.Closer).Close())
-			}()
+			})
 			return nil
 		})
 	mockExecer.EXPECT().
@@ -70,15 +67,12 @@ func TestRepositoryListRemoteRefsOptions(t *testing.T) {
 				"--heads", "origin", "refs/heads/feat*",
 			}, cmd.Args[1:])
 
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
-
+			wg.Go(func() {
 				_, _ = io.WriteString(cmd.Stdout, "abc123\trefs/heads/feat1\n")
 				_, _ = io.WriteString(cmd.Stdout, "def456\trefs/heads/feat2\n")
 				_, _ = io.WriteString(cmd.Stdout, "ghi789\trefs/heads/feat3\n")
 				assert.NoError(t, cmd.Stdout.(io.Closer).Close())
-			}()
+			})
 			return nil
 		})
 	mockExecer.EXPECT().