Re: [PATCH 0/3] Add a "fix" command to "rebase --interactive"

Quoting Johannes Schindelin [off-list ref]

Hi,

On Fri, 4 Dec 2009, Junio C Hamano wrote:

quoted

Matthieu Moy [off-list ref] writes:

quoted

Michael J Gruber [off-list ref] writes:

quoted

quoted

If the idea of a "fix" command is acceptable, then I would like to
implement a further convenience: if a group of commits to be folded
together includes *only* "fix" commits, then the first log message
should be used without even opening an editor.  But I would like to
get a reaction to the "fix" command in general before doing so.

I'd say that would make a useful command ("fix") even more useful, being
just the right counterpart to "reword" for trivial commit message fixes.

+1 for fix, and +1 for the "don't even launch the editor" too.

I like it, too.  Also I vaguely recall that there was a series that died
that would have allowed you to give hints to help this behaviour at the
time you make "fix-up" commits; we may want to resurrect it on top of this
feature.

I'll just repeat this exactly one more time: it is not always possible to 
know whether you make a fix-up commit, and it is not always possible to be 
sure that you want to amend the next time you do a rebase.

So: Commit time is definitely a bad time to decide on the action in some 
future rebase event.

I think Junio is referring to this thread:

  http://thread.gmane.org/gmane.comp.version-control.git/127923/focus=121874

The old patch added a convention to mark a fix-up commit 
with a special string "!fixup" and refer to which commit 
in the series it is fixing.  It added --autosquash option
to rebase--interactive that tells it to move such a commit 
to an appropriate place in the series and change its 'pick' 
to 'squash'. I think with Michael's patches, it can change 
'pick' to 'fix' instead.

I too think Michael's "fix" is a good feature, and in the 
workflow by Shawn, he knows he is fixing up an earlier 
commit, and he knows he doesn't want to add anything to 
the message by the fix-up commit when he makes that commit 
(how else would he have messages like "a", "s", or "foo").

I don't think your objection should block *others* (like
Shawn and Junio) who can decide when they make commits 
from using the feature from my old patch to make it even 
easier to clean up their topics. If *you* can't decide if 
you want to amend or not when you make a fix-up commit, you 
can leave your fix-up commits unmarked, run interactive 
rebase without the --autosquash option, and use Michael's 
'fix' manually. People who can sometimes but not always 
decide when they make commits can do the same when they 
can't.

Isn't it what Junio suggested by his "on top of this feature", 
and wouldn't that make everybody happy?

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/