threads / bug / 40493

git interactive rebase bug?

Subject: git interactive rebase bug?

## tl;dr

6 messages between Oct 5, 2015 and Oct 6, 2015.

replies: 5people: 3as markdown or json

Jacob Keller· Oct 5, 2015, 22:39 UTC · lore

Hey,

I've been experiencing a very annoying bug when performing interactive rebases. The rebase process will stall after I close the editor, and I have to kill the process and then restart the rebase using "git rebase --continue"

I am not sure how to debug this further. Suggestions are welcome. It is an intermittent issue, so it doesn't always happen but it seems to happen fairly often (at least every other attempt).

It appears to only occur after an interactive rebase, with an editor is closed.

Regards, Jake

Jacob Keller· Oct 5, 2015, 22:40 UTC · re: Jacob Keller · lore

Re: git interactive rebase bug?

On Mon, Oct 5, 2015 at 3:39 PM, Jacob Keller <jacob.keller@gmail.com> wrote:

Show 15 quoted lines

> Hey,
>
> I've been experiencing a very annoying bug when performing interactive
> rebases. The rebase process will stall after I close the editor, and I
> have to kill the process and then restart the rebase using "git rebase
> --continue"
>
> I am not sure how to debug this further. Suggestions are welcome. It
> is an intermittent issue, so it doesn't always happen but it seems to
> happen fairly often (at least every other attempt).
>
> It appears to only occur after an interactive rebase, with an editor is closed.
>
> Regards,
> Jake

Note, I have this problem when using the latest of next branch, haven't had it in the past when using the latest released version, so I think it's a rather recent regression.

Regards, Jake

Junio C Hamano· Oct 5, 2015, 23:03 UTC · re: Jacob Keller · lore

Re: git interactive rebase bug?

Jacob Keller <jacob.keller@gmail.com> writes:

Show 17 quoted lines

>> I've been experiencing a very annoying bug when performing interactive
>> rebases. The rebase process will stall after I close the editor, and I
>> have to kill the process and then restart the rebase using "git rebase
>> --continue"
>>
>> I am not sure how to debug this further. Suggestions are welcome. It
>> is an intermittent issue, so it doesn't always happen but it seems to
>> happen fairly often (at least every other attempt).
>>
>> It appears to only occur after an interactive rebase, with an editor is closed.
>>
>> Regards,
>> Jake
>
> Note, I have this problem when using the latest of next branch,
> haven't had it in the past when using the latest released version, so
> I think it's a rather recent regression.

Platform, editor, terminal emulator, specifics?

I have been on Ubuntu, coming over ssh, running "screen" as the terminal enumlator, displaying on Gnome terminal, and my editor is "emacsclient -c" to an instance of Emacs in the screen session. I primarily run a version that is a bit ahead of 'next' (unless it is very close to the feature release, in which case I tend to run 'master') and haven't noticed anything new that is strange.

Jacob Keller· Oct 6, 2015, 04:34 UTC · re: Junio C Hamano · lore

Re: git interactive rebase bug?

On Mon, Oct 5, 2015 at 4:03 PM, Junio C Hamano <gitster@pobox.com> wrote:

> Platform, editor, terminal emulator, specifics?
>

I run ssh to a tmux terminal emulator and run vim, I normally see this when my local client is a windows machine running putty. After I close the editor it just hangs. and I have to Ctrl-C to get it to go. I suppose it could be an issue with vim or similar.

I never noticed the problem with the same setup when I wasn't using the next branch. Tomorrow I will have some time to try out the 2.5.x tag and maybe see if I can bisect if it doesn't have an issue. I can try 3-4 rebase interactive attempts it usually shows up pretty fast. What bothers me is that it's not 100% reproducible.

I'll follow up with more detail tomorrow.

Regards, Jake

Matthieu Moy· Oct 6, 2015, 06:53 UTC · re: Jacob Keller · lore

Re: git interactive rebase bug?

Jacob Keller <jacob.keller@gmail.com> writes:

Show 6 quoted lines

> I've been experiencing a very annoying bug when performing interactive
> rebases. The rebase process will stall after I close the editor, and I
> have to kill the process and then restart the rebase using "git rebase
> --continue"
>
> I am not sure how to debug this further. Suggestions are welcome.

First, I'd try "pstree" ("pstree -p" to get pid) to see if your editor is really dead.

Then, "strace -p" on the git process, to see if it's doing some system calls while hanged, or if it's hanged on a particular syscall. Hopefully, this will yield some "open" calls and tell you which files Git is currently working with.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

Jacob Keller· Oct 6, 2015, 17:41 UTC · re: Matthieu Moy · lore

Re: git interactive rebase bug?

On Mon, Oct 5, 2015 at 11:53 PM, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> wrote:

Show 19 quoted lines

> Jacob Keller <jacob.keller@gmail.com> writes:
>
>> I've been experiencing a very annoying bug when performing interactive
>> rebases. The rebase process will stall after I close the editor, and I
>> have to kill the process and then restart the rebase using "git rebase
>> --continue"
>>
>> I am not sure how to debug this further. Suggestions are welcome.
>
> First, I'd try "pstree" ("pstree -p" to get pid) to see if your editor is really dead.
>
> Then, "strace -p" on the git process, to see if it's doing some system
> calls while hanged, or if it's hanged on a particular syscall.
> Hopefully, this will yield some "open" calls and tell you which files
> Git is currently working with.
>
> --
> Matthieu Moy
> http://www-verimag.imag.fr/~moy/

And of course now I can't get it to fail at all. It did hang one time for about 15-20 seconds and then worked, and suddenly no longer has issues... I'll try to remember these two tricks incase it does hang again and I'll report what I find.

Thanks, Jake