Re: Black smoke from git rebase -i exec

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Aug 10, 2010, 13:37 UTC
Message-ID: <vpqlj8ezizq.fsf@bauges.imag.fr>
In-Reply-To: <AANLkTikCgSNRipTbjiL+uPOqCL3WXwn08_QV=UJ7EwvT@mail.gmail.com>

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

> There's some black smoke in pu after the git rebase -i series was
> applied: http://smoke.git.nix.is/app/projects/report_details/14

Strange, I can't reproduce this on my box (tried on RHEL x86_64 and Debian i686).

>     expecting success:

...

>     	rm -f touch-*
>
>     Switched to a new branch 'master'

At this point, I get

rebase -i script before editing: pick 313fe96 B pick d0f65f2 C pick 0547e3f D pick 8f99a4f E

rebase -i script after editing: pick 313fe96 B exec touch touch-one pick d0f65f2 C exec touch touch-two exec false exec touch touch-three pick 0547e3f D pick 8f99a4f E exec touch "touch-file name with spaces"; touch touch-after-semicolon

which you don't seem to get on your side. I get the same as you if I comment out the "set_fake_editor" line at the top of the script. So, I suspect there's something very wrong that prevents it from doing its job.

Can you add some debug

echo "$EDITOR" echo "$FAKE_EDITOR"

somewhere in the test to see what happens?

Show 6 quoted lines

>     Rebasing (4/4)
> Successfully rebased and updated refs/heads/master.
>     Stopped at wrong revision:
>     (E instead of C)
>     Stopped at wrong revision:
>     (E instead of master)

(here, it's definitely doing as if the todolist had not been edited)

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