A call for better git-rebase messages

A call for better git-rebase messages

[Jakub Narebski]

 $ git rebase abort
 mkdir: cannot create directory `.dotest': File exists

 It seems that I cannot create a .dotest directory, and I wonder if you
 are in the middle of patch application or another rebase.  If that is not
 the case, please rm -fr .dotest and run me again.  I am stopping in case
 you still have something valuable there.

Why we do not tell to run "git rebase --abort" here? I think the command
know that it is a middle of git-rebase, not the middle of git-am...


 $ git rebase --onto origin next gitweb/web
 Nothing to do.

I'm not sure, but I think gitweb/web which was empty branch based off
former next is now empty branch based off current gitweb, i.e. at least
head of this branch has changed... but I'm not sure because

 $ git rebase --abort

is _not_ recorded as such, but as "reset --hard ORIG_HEAD" (I think).
It looks like it is, because after "reset --hard ORIG_HEAD" (which was
result of "git rebase --abort" of "git rebase origin" (I forgot
gitweb/web was based off other branch) there is "reset --hard <sha1>",
and this sha1 is sha1 of both gitweb/web and origin.

I'd rather rebase told me that it did something (moved head), but
there are no patches to be applied.
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git

Re: A call for better git-rebase messages

[Junio C Hamano]

Jakub Narebski <jnareb@gmail.com> writes:

>  $ git rebase abort
>  mkdir: cannot create directory `.dotest': File exists
>
>  It seems that I cannot create a .dotest directory, and I wonder if you
>  are in the middle of patch application or another rebase.  If that is not
>  the case, please rm -fr .dotest and run me again.  I am stopping in case
>  you still have something valuable there.
>
> Why we do not tell to run "git rebase --abort" here? I think the command
> know that it is a middle of git-rebase, not the middle of git-am...

Does it?  At least the original author of the command does not
know if you did this:

	$ git am mbox
        ... ugh, conflicted.
	$ git rebase master