Hacktoberfest 2026: los issues que los mantenedores marcaron para octubre, abiertos y aptos para principiantes. Explorar issues de Hacktoberfest

gh stack rebase replays the same child commit twice on v0.1.1

Abierto
#495 0 comentarios 0 reacciones 0 asignados Ver en GitHub

Nadie ha tomado este issue todavía.

Evaluación

Dificultad
4/5
Tiempo estimado
3-5 días
Aptitud para principiantes
52/100
Tipo de issue
Error
Claridad
Bastante claro
Estado de actividad
Activo
Stack tecnológico
git, go
Área
cli, tooling

Línea de trabajo

Empieza con el comando gh stack rebase y reproduce en Windows o PowerShell la pila de tres capas descrita en el issue. Inspecciona el estado del rebase en cascada para stack3/02-service, incluidos .git/rebase-merge/done y git rebase --edit-todo. Se considera terminado cuando el rango de commits propio de cada capa se reaplica exactamente una vez y la capa API realiza correctamente el rebase sobre la capa de servicio actualizada.

Escrito por el modelo de indexación a partir del texto del issue.

Descripción

Summary

gh stack rebase appears to replay the same child commit twice when a lower
branch in a stack receives a new commit.

This reproduces consistently for me with gh stack v0.1.1 on a freshly
created stack.

This looks similar to #250, but I am reproducing it on v0.1.1, which includes
the fix for amended parent commits being replayed into child branches.

Environment

  • OS: Windows
  • Shell: PowerShell
  • gh stack version: 0.1.1
  • Stack trunk: main

Stack

I created a simple three-layer stack:

main
  └─ stack3/01-model
       └─ stack3/02-service
            └─ stack3/03-api

Each layer initially has one commit:

  • stack3/01-model: Add Product model
  • stack3/02-service: Add Product Service
  • stack3/03-api: Add Product API

I then added another commit to the bottom layer (stack3/01-model).

Conceptually:

main
  └─ Add Product model
       └─ Add price to Product model
            └─ [Product Service should be rebased here]
                 └─ [Product API should be rebased here]

Reproduction

After adding the new commit to stack3/01-model, I ran:

gh stack rebase

Output:

Fetched latest main from origin
Trunk main is already up to date
Stack detected: (main) <- stack3/01-model <- stack3/02-service <- stack3/03-api
Rebasing branches in order, starting from stack3/01-model to stack3/03-api
Rebased stack3/01-model onto main

The command then stops while rebasing stack3/02-service.

From another terminal:

git status

reports:

interactive rebase in progress; onto 9c2c2c2

Last command done (1 command done):
   pick 96bd07c # Add Product Service

Next command to do (1 remaining command):
   pick 96bd07c # Add Product Service

You are currently rebasing branch 'stack3/02-service' on '9c2c2c2'.
(all conflicts fixed: run "git rebase --continue")

Changes to be committed:
    new file: src/product-service.js

I inspected the rebase state.

git rebase --edit-todo contains:

pick 96bd07c # Add Product Service

And:

Get-Content .git\rebase-merge\done

contains:

pick 96bd07c... # Add Product Service

Therefore the same commit (96bd07c) appears to have already been processed
and is also still present as the next commit in the rebase todo.

Actual behavior

The cascade rebase gets stuck while rebasing the second layer.

The same Add Product Service commit appears as both:

  • the last completed rebase command, and
  • the next remaining rebase command.

src/product-service.js is already staged from the first application.

Expected behavior

Each layer's own commit range should be replayed exactly once onto the newly
rebased parent.

Conceptually, after changing the bottom layer:

main
  └─ model
       └─ model-update
            └─ service'
                 └─ api'

The service commit should be replayed once onto the new 01-model head, and
the API commit should then be replayed once onto the new 02-service head.

Additional notes

I previously encountered a similar failure with another stack. To rule out
corrupted state from that experiment, I created stack3 from scratch and
reproduced the problem again.

I also confirmed that the installed extension is current:

gh stack -v
gh stack version 0.1.1

gh extension upgrade github/gh-stack
[stack]: already up to date

This looks related to #250, but that issue reproduced on v0.0.8 and the
release notes indicate that amended-parent replay behavior has since been
fixed.

Happy to provide the repository or additional .git/gh-stack / rebase
metadata if useful.

Lenguaje dominante
Go
Estrellas
1.5k
Forks
73
Merge medio
1 d 8 h
PR fusionados (30 d)
7

Guía de contribución

Abrir la guía de contribución

Primeros pasos

  1. Lee el issue completo y luego la guía de contribución del proyecto.
  2. Comenta en el issue que vas a ocuparte — evita que dos personas hagan lo mismo.
  3. Haz un fork del repositorio y trabaja en una rama.
  4. Abre un pull request que haga referencia al número del issue.

Más de github/gh-stack

Todos los issues de github/gh-stack

Issues similares

Más issues de Go

Recibe los nuevos issues en tu correo

Un resumen breve de issues de GitHub para principiantes.