Release v0.19.1 (#915)

Backport #914 to 0.19

Author: abhinav

.changes/v0.19.1.md

@@ -0,0 +1,3 @@
+## <a name="v0.19.1">v0.19.1</a> - 2025-10-25
+### Fixed
+- branch delete: Fix prompt for unmerged branch deletion not respecting the "no" answer.

CHANGELOG.md

@@ -5,6 +5,10 @@ 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.19.1">v0.19.1</a> - 2025-10-25
+### Fixed
+- branch delete: Fix prompt for unmerged branch deletion not respecting the "no" answer.
+
 ## <a name="v0.19.0">v0.19.0</a> - 2025-10-19
 ### Added
 - Add experimental 'gs commit pick' to cherry-pick a commit and update upstack branches in one go. Opt into it with `git config --global spice.experiment.commitPick true`. The command presents an interactive prompt when invoked without any arguments. ![demo of gs commit pick](https://media.githubusercontent.com/media/abhinav/git-spice/refs/heads/main/doc/tapes/20251018-commit-pick.gif)

CONTRIBUTING.md

@@ -189,3 +189,83 @@ To release a new version, take the following steps:
    Feel free to edit it before merging if needed.
 3. Once the pull request has merged, trigger the
    [Publishh release workflow](https://github.com/abhinav/git-spice/actions/workflows/publish-release.yml).
+
+## Backporting changes
+
+(For maintainers only.)
+
+To backport a change to a previous release branch,
+take the following steps:
+
+1. Determine the series name.
+   This is the combination of the major and minor version numbers,
+   e.g. for version `v0.5.2`, the series name is `0.5`.
+
+   ```bash
+   SERIES=0.5
+   ```
+
+2. Ensure that a release series branch exists.
+   This is normally named `release/vX.Y.x`,
+   where `X.Y` is the series name determined above.
+
+    ```bash
+    BRANCH="release/v${SERIES}.x"
+    if git branch -r --list "origin/${BRANCH}" | grep -q .; then
+        echo "Release branch ${BRANCH} alrady exists."
+    else
+        echo "Release branch ${BRANCH} does not exist."
+        LATEST_TAG=$(git tag --list "v${SERIES}.*" --sort=-v:refname | head -n 1)
+        echo "Creating branch ${BRANCH} from latest tag ${LATEST_TAG}."
+        echo "Press Enter to continue."
+        read
+        git branch "${BRANCH}" "${LATEST_TAG}"
+        git push origin "${BRANCH}"
+    fi
+    ```
+
+3. Create a backport branch from the release branch.
+
+    ```bash
+    BACKPORT_BRANCH="backport-${SERIES}-$(date +%Y%m%d%H%M%S)"
+    git checkout -b "${BACKPORT_BRANCH}" "origin/${BRANCH}"
+    ```
+
+4. Cherry-pick the desired commits to backport.
+
+    ```bash
+    git cherry-pick <commit-hash-1> <commit-hash-2> ...
+    ```
+
+5. Prepare the changelog for the backport.
+
+   ```bash
+   changie batch patch && changie merge
+   git add .changes CHANGELOG.md
+   NEW_VERSION=$(changie latest)
+   git commit -m "Release ${NEW_VERSION}"
+   ```
+
+5. Submit a pull request from the backport branch
+   against the release branch, e.g.
+
+   ```bash
+   git push -u origin "${BACKPORT_BRANCH}"
+   gh pr create \
+     --base "${BRANCH}" \
+     --head "${BACKPORT_BRANCH}" \
+     --title "Release ${NEW_VERSION}"
+   ```
+
+6. Once the pull request is merged,
+   trigger the
+   [Publish release workflow](https://github.com/abhinav/git-spice/actions/workflows/publish-release.yml)
+   for the release branch to create a new release.
+
+7. Merge the release branch back to main.
+
+    ```bash
+    git checkout main
+    git merge "origin/${BRANCH}"
+    git push origin main
+    ```

internal/handler/delete/handler.go

@@ -325,6 +325,12 @@ func (h *Handler) DeleteBranches(ctx context.Context, req *Request) error {
 			if err := ui.Run(h.View, prompt); err != nil {
 				return fmt.Errorf("run prompt: %w", err)
 			}
+
+			// If the user declined the prompt, skip this branch.
+			if !force {
+				log.Infof("%v: skipped deletion", branch)
+				continue
+			}
 		}
 
 		if exists {

testdata/script/issue912_branch_delete_unmerged_declined.txt

@@ -0,0 +1,36 @@
+# When declining the prompt to delete an unmerged branch,
+# the branch should not be deleted.
+#
+# https://github.com/abhinav/git-spice/issues/912
+
+as 'Test <[email protected]>'
+at '2025-10-25T10:00:00Z'
+
+mkdir repo
+cd repo
+git init
+git commit --allow-empty -m 'initial commit'
+gs repo init
+
+git add foo.txt
+gs bc foo -m 'add foo.txt'
+
+git checkout main
+
+# Decline the prompt to delete the unmerged branch
+env ROBOT_INPUT=$WORK/robot.golden ROBOT_OUTPUT=$WORK/robot.actual
+gs branch delete foo
+cmp $WORK/robot.actual $WORK/robot.golden
+stderr 'foo: skipped deletion'
+
+# Branch should still exist
+git rev-parse --verify foo
+stdout '1b2aafed11ebc65ef2643881bf22015cf352790f'
+
+-- repo/foo.txt --
+whatever
+-- robot.golden --
+===
+> Delete foo anyway?: [y/N]
+> foo has not been merged into HEAD. This may result in data loss.
+false