From: Phillip Wood <phillip.wood@talktalk.net>
To: Jeff King <peff@peff.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: 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 14:31:37 +0000 [thread overview]
Message-ID: <ab4b0a47-858e-659f-f970-944b7c5313fc@talktalk.net> (raw)
In-Reply-To: <20181201200209.GC29120@sigill.intra.peff.net>
On 01/12/2018 20:02, Jeff King wrote:
> On Thu, Nov 29, 2018 at 09:32:48AM +0100, Johannes Schindelin wrote:
>
>>>> Would it not make more sense to add a command-line option (and a config
>>>> setting) to re-schedule failed `exec` commands? Like so:
>>>
>>> Your proposition would do in most cases, however it is not possible to
>>> make a distinction between reschedulable and non-reschedulable commands.
>>
>> True. But I don't think that's so terrible.
>>
>> What I think is something to avoid is two commands that do something very,
>> very similar, but with two very, very different names.
>>
>> In reality, I think that it would even make sense to change the default to
>> reschedule failed `exec` commands. Which is why I suggested to also add a
>> config option.
>
> 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.
>
> How would I move past the test that fails to continue? I guess "git
> rebase --edit-todo" and then manually remove it (and any other remaining
> test lines)?
Perhaps we could teach git rebase --skip to skip a rescheduled command,
it could be useful if people want to skip rescheduled picks as well
(though I don't think I've ever had that happen in the wild). I can see
myself turning on the rescheduling config setting but occasionally
wanting to be able to skip over the rescheduled exec command.
Best Wishes
Phillip
> That's not too bad, but I wonder if people would find it more awkward
> than the current way (which is to just "rebase --continue" until you get
> to the end).
>
> I dunno. I am not sure if I am for or against changing the default, so
> these are just some musings. :)
>
> -Peff
>
next prev parent reply other threads:[~2018-12-03 14:31 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 [this message]
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
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=ab4b0a47-858e-659f-f970-944b7c5313fc@talktalk.net \
--to=phillip.wood@talktalk.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=paul.morelle@gmail.com \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
/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).