[BUG] Invalid rebase command leaves unclean status

[BUG] Invalid rebase command leaves unclean status

[ulrik]

Hello git list

A bug in rebase -i: A typo in the command (for example in the branch
name) still makes later invocations of rebase think a rebase is
already in process.

I found this bug in master, and it was already reported to the mailing
list under version 1.5.3.5, but there were no follow-ups to that mail.
I'm using 1.5.3.7 and it is still present, and looking at the maint
branch it does not seem to be mentioned in post-x.3.7 changes there.
So I am now reporting this bug again. I'm sorry for not checking this
in master, I'll have to ask someone on the list to do that.

Original email:
http://marc.info/?l=git&m=119410951019002&w=2
Date:       2007-11-03 17:04:51
Message-ID: 200711031804.52259.elendil () planet ! nl

# A sample session:
# Invoking rebase with a typo, there is no "muster" branch
$ git rebase -i muster
fatal: Needed a single revision
Invalid base
$ git rebase -i master
Interactive rebase already started
$ git rebase --abort
fatal: Needed a single revision
# Even though rebase --abort reports an error, rebase's internal state
is now cleared

Regards,
Ulrik Sverdrup

Re: [BUG] Invalid rebase command leaves unclean status

[Wincent Colaiuta]

El 19/12/2007, a las 1:47, ulrik escribió:

> Hello git list
>
> A bug in rebase -i: A typo in the command (for example in the branch
> name) still makes later invocations of rebase think a rebase is
> already in process.

It's already been fixed on master:

$ mkdir demo
$ git init
Initialized empty Git repository in .git/
$ echo a > a
$ git add a
$ git commit -m a
Created initial commit 36a2b58: a
  1 files changed, 1 insertions(+), 0 deletions(-)
  create mode 100644 a
$ git checkout -b other
Switched to a new branch "other"
$ git rebase -i muster
fatal: Needed a single revision
Invalid base
$ git rebase -i master
Nothing to do

Cheers,
Wincent

[BUG] Invalid rebase command leaves unclean status

[Frans Pop]

[-- Attachment #1: Type: text/plain, Size: 472 bytes --]

The first command results in the creation of an empty .dotest-merge/output 
file which blocks any next attempt to do an interactive rebase until it is 
manually removed.

$ git rebase master -i
Invalid branchname: -i
$ git rebase -i master
Interactive rebase already started
$ ls .git/.dotest-merge/
output
$ cat .git/.dotest-merge/output
$ rm -r .git/.dotest-merge/
$ git rebase -i master 
<works>

This is with git version 1.5.3.5.

Cheers,
Frans Pop

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 189 bytes --]