commitizen / commitizen/cz-cli

Config with prepare-commit-msg blocks squashing via interactive rebase

Abierto
#669 2 comentarios 0 reacciones 0 asignados Ver en GitHub
Lenguaje dominante
JavaScript
Estrellas
17.5k
Forks
566
Merge medio
8 h 16 min
PR fusionados (30 d)
1

Descripción

Hello, first off thanks for making this wonderful library.

I'm currently using husky to enforce commitizen on every commit. It's been working fine, however, there are times when I need to manually squash certain commits. To do this, [I use an interactive rebase (ex: `git rebase -i HEAD~4`)](https://github.com/todotxt/todo.txt-android/wiki/Squash-All-Commits-Related-to-a-Single-Issue-into-a-Single-Commit). Whenever I do this it gets stuck and the rebase has to abort.

I've tried the [following solution](https://gmurphey.github.io/2013/02/02/ignoring-git-hooks-when-rebasing.html#.XV3d2pNKgqs):

```
#!/bin/sh
BRANCH_NAME=$(git branch | grep '*' | sed 's/* //')

if [ $BRANCH_NAME != '(no branch)' ]
then
exec < /dev/tty && git-cz --hook || true
fi
```

However, it doesn't work, I presume, when in the squashing step. It just freezes.

I've also had trouble running `yarn version --no-commit-hooks` and `yarn config set version-commit-hooks false`, which also freezes

Any idea on how to get around this?

Update: for husky v2.4.0 and above, it seems like you can use `HUSKY_SKIP_HOOKS=1 git rebase ...`. I'll go this route for now, however, I'll leave the issue open in case there's a better alternative for those not using husky

Guía de contribución

Abrir la guía de contribución

Línea de trabajo

Reproduce el freeze con `git rebase -i HEAD~4`, el workaround mostrado para el hook `prepare-commit-msg` y `yarn version --no-commit-hooks`. Rastrea cómo se invocan los hooks de commit durante el rebase interactivo y el versionado, y define como terminado evitar el freeze sin depender de `HUSKY_SKIP_HOOKS=1`, manteniendo al mismo tiempo la aplicación normal de commitizen.

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

Evaluación

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

Recibe los nuevos issues en tu correo

Un resumen breve de issues de GitHub para principiantes.