From: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Jeff King <peff@peff.net>, Paul Morelle <paul.morelle@gmail.com>,
Git Users <git@vger.kernel.org>
Subject: Re: [PATCH] rebase -i: introduce the 'test' command
Date: Mon, 3 Dec 2018 20:34:54 +0100 [thread overview]
Message-ID: <20181203193453.xmyu63wydym3koog@ltop.local> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1812031957060.41@tvgsbejvaqbjf.bet>
On Mon, Dec 03, 2018 at 08:01:44PM +0100, Johannes Schindelin wrote:
> Hi Luc,
>
> On Mon, 3 Dec 2018, Luc Van Oostenryck wrote:
>
> > On Sat, Dec 01, 2018 at 03:02:09PM -0500, Jeff King wrote:
> > > I sometimes add "x false" to the top of the todo list to stop and create
> > > new commits before the first one. That would be awkward if I could never
> > > get past that line. However, I think elsewhere a "pause" line has been
> > > discussed, which would serve the same purpose.
> > >
> > > I wonder how often this kind of "yes, I know it fails, but keep going
> > > anyway" situation would come up. And what the interface is like for
> > > getting past it. E.g., what if you fixed a bunch of stuff but your tests
> > > still fail? You may not want to abandon the changes you've made, but you
> > > need to "rebase --continue" to move forward. I encounter this often when
> > > the correct fix is actually in an earlier commit than the one that
> > > yields the test failure. You can't rewind an interactive rebase, so I
> > > complete and restart it, adding an "e"dit at the earlier commit.
> >
> > In this sort of situation, I often whish to be able to do nested rebases.
> > Even more because it happen relatively often that I forget that I'm
> > working in a rebase and not on the head, and then it's quite natural
> > to me to type things like 'git rebase -i @^^^' while already rebasing.
> > But I suppose this has already been discussed.
>
> Varieties of this have been discussed, but no, not nested rebases.
Interesting :)
> The closest we thought about was re-scheduling the latest <n> commits,
> which is now harder because of the `--rebase-merges` mode.
>
> But I think it would be doable. Your idea of a "nested" rebase actually
> opens that door quite nicely. It would not *really* be a nested rebase,
> and it would still only be possible in interactive mode, but I could
> totally see
>
> git rebase --nested -i HEAD~3
I don't mind much if it would be "really nested" or "as-if nested" but
with this flag --nested I wonder what would happen if I would use it
in a 'top-level' rebase (or, said in another way, would I be able
to alias 'rebase' to 'rebase --nested')?
> to generate and prepend the following lines to the `git-rebase-todo` file:
>
> reset abcdef01 # This is HEAD~3
> pick abcdef02 # This is HEAD~2
> pick abcdef03 # This is HEAD~
> pick abcdef04 # This is HEAD
>
OK, I see.
This would not be nestable/stackable but would solve the problem nicely.
Best regards,
-- Luc
next prev parent reply other threads:[~2018-12-03 19:35 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-28 13:28 [PATCH] rebase -i: introduce the 'test' command Paul Morelle
2018-11-28 15:19 ` Johannes Schindelin
2018-11-28 16:56 ` Paul Morelle
2018-11-29 8:32 ` Johannes Schindelin
2018-11-29 10:55 ` Johannes Schindelin
2018-12-01 20:02 ` Jeff King
2018-12-02 2:28 ` Eric Sunshine
2018-12-02 3:31 ` Jeff King
2018-12-11 12:40 ` Ævar Arnfjörð Bjarmason
2018-12-11 14:11 ` Jeff King
2018-12-02 19:48 ` Johannes Schindelin
2018-12-03 14:31 ` Phillip Wood
2018-12-03 21:27 ` Jeff King
2018-12-03 17:27 ` Luc Van Oostenryck
2018-12-03 19:01 ` Johannes Schindelin
2018-12-03 19:34 ` Luc Van Oostenryck [this message]
2018-12-03 21:31 ` Jeff King
2018-12-04 9:13 ` Johannes Schindelin
2018-12-03 17:53 ` Duy Nguyen
2018-12-03 19:03 ` Johannes Schindelin
2018-12-03 21:34 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181203193453.xmyu63wydym3koog@ltop.local \
--to=luc.vanoostenryck@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=paul.morelle@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).