From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v3] sequencer: rectify empty hint in call of require_clean_work_tree()
Date: Thu, 10 Aug 2023 13:24:27 +0200 [thread overview]
Message-ID: <ZNTI6xpXIRaoFlxx@ugly> (raw)
In-Reply-To: <xmqq7cq3lwli.fsf@gitster.g>
On Wed, Aug 09, 2023 at 02:44:25PM -0700, Junio C Hamano wrote:
>"git rebase" does not seem to start (i.e. does not perform "initial
>checkout") from a dirty working tree, with
>
> error: cannot rebase: You have unstaged changes.
> error: Please commit or stash them.
>
>at least from my quick attempt. I am not sure if this is actually
>triggerble?
>
hmm, unless i'm missing something, it is apparently not ... currently.
it becomes actually relevant only after my "rebase: improve resumption
from incorrect initial todo list" patch, which still needs reworking.
so there are several possibilities how to proceed with this:
- you merge it as a merely theoretical fix (adjust the commit message
yourself if saving the round-trip is more convenient for you)
- we postpone the change until it becomes not theoretical
- we make sure that the code really is not triggerable and delete it.
this would obviously introduce some churn, as i'll need to
re-introduce it. but then, i remember that something was wrong with it
anyway (i.e., it didn't actually trigger in some cases i expected it
to, but i haven't figured out yet why), so the new code would be
slightly different anyway.
regards
next prev parent reply other threads:[~2023-08-10 11:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 16:22 [PATCH] sequencer: rectify empty hint in call of require_clean_work_tree() Oswald Buddenhagen
2023-04-27 7:58 ` Oswald Buddenhagen
2023-04-27 21:13 ` Junio C Hamano
2023-04-27 22:33 ` Oswald Buddenhagen
2023-05-02 18:57 ` Felipe Contreras
2023-05-03 7:15 ` Oswald Buddenhagen
2023-08-07 17:09 ` [PATCH v2] " Oswald Buddenhagen
2023-08-07 20:19 ` Junio C Hamano
2023-08-09 17:15 ` [PATCH v3] " Oswald Buddenhagen
2023-08-09 21:44 ` Junio C Hamano
2023-08-10 11:24 ` Oswald Buddenhagen [this message]
2023-08-10 16:04 ` Junio C Hamano
2023-08-24 15:00 ` [PATCH v4] " Oswald Buddenhagen
2023-08-24 15:59 ` Junio C Hamano
2023-08-09 1:24 ` [PATCH v2] " Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZNTI6xpXIRaoFlxx@ugly \
--to=oswald.buddenhagen@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.