Finishing feature with --squash not working

jluttine commented 8 years ago

Finishing a feature branch with --squash does not work. The end state has develop branch checked out but the feature branch commits have not been merged, they've been only staged or something like that.

I'm using Spacemacs, so the key bindings might be different than in normal Emacs. Anyway, here are the steps to reproduce:

$ mkdir tmp
$ cd tmp
$ git init
$ git flow init
$ emacs

Open magit: SPC g s
Create feature branch: % f s featurebranch
Create a file: SPC f f foobar
Save the file: SPC f s
Open magit: SPC g s
Stage and commit the file.
Finish feature branch with squash: % f f -s f

Emacs seems like it hangs, but you can press CTRL g. The feature branch finishing is in some weird non-finished state.

magit-version: Magit 29160815.1946, Git 2.9.3, Emacs 24.5.2, gnu/linux

tarsius commented 8 years ago

@jtatarik Maybe you have to do the equivalent of this: https://github.com/magit/magit/commit/75b8e4edc37f69e68cf34187eaad4daebb591a3f

jluttine commented 8 years ago

I'm using GPG signing if that matters.

jtatarik / magit-gitflow

Finishing feature with --squash not working #18