Re: git rebase -f --autosquash

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 4, 2012, 20:05 UTC
Message-ID: <7vlik2sv00.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CABURp0p+NbYbiEO3n1iwP4jH63CjqvE6zhk6pHFjGU7+N0=vXA@mail.gmail.com>

Phil Hord <phil.hord@gmail.com> writes:

> ...  That both are
> required seems to me to be an embarrassing, historical implementation
> detail.

I do not know if we are discussing the same thing.

There is nothing historical in that "--interactive" is the word used to tell the command that the user wants to replay commits in an order that is different from the order they were found in the original commit DAG. If you want to tweak the order, you use "interactive". If you don't, you don't.

There indeed is implementation detail to worry about. The "-p" mode that is *not* about letting the user modify the order of replayed commits internally does use the same machinery as interactive, but that is hidden from the end user (the "implied" value in $interactive_rebase in git-rebase.sh makes this difference).

But this case is not about replaying the commit without reordering.

If you are proposing to rename "--interactive" to "--reorder" or something, with a solid migration plan to keep the current users happy, and possibly are proposing to add non-interactive autosquash implementation outside git-rebase--interactive.sh, the issue would entirely be different, but I somehow do not sense that is the direction in which you are trying to go.