From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Patrick Steinhardt <ps@pks.im>,
Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Brian Lyles <brianmlyles@gmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH] rebase: apply and cleanup autostash when rebase fails to start
Date: Sun, 08 Sep 2024 14:54:20 -0700 [thread overview]
Message-ID: <xmqqv7z5vmk3.fsf@gitster.g> (raw)
In-Reply-To: <0ca8ce79-6c9f-4836-99d6-b2a86dfe4109@gmail.com> (Phillip Wood's message of "Thu, 15 Aug 2024 10:47:59 +0100")
Phillip Wood <phillip.wood123@gmail.com> writes:
> ... This code is just doing what we do at
> the end of a successful rebase so I'm don't really understand what the
> issue is. Looking at finish_rebase() we don't even check the return
> value of apply_autostash() when applying the stash at the end of a
> successful rebase.
At that point we give control back the user, so if things are left
in conflicted or any other "unexpected" funny state, the user kill
keep the both halves. As long as the user clearly understands why
the working tree is in such a funny state, we should be OK (and I
would imagine that we are giving messages like "applying preexisting
changes stashed away before rebasing" or something).
Thanks.
next prev parent reply other threads:[~2024-09-08 21:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-14 13:22 [PATCH] rebase: apply and cleanup autostash when rebase fails to start Phillip Wood via GitGitGadget
2024-08-14 14:36 ` Patrick Steinhardt
2024-08-14 15:59 ` Phillip Wood
2024-08-14 17:27 ` Junio C Hamano
2024-08-15 9:47 ` Phillip Wood
2024-09-08 21:54 ` Junio C Hamano
2024-09-08 21:54 ` Junio C Hamano [this message]
2024-09-02 15:12 ` [PATCH v2] " Phillip Wood via GitGitGadget
2024-09-08 21:55 ` Junio C Hamano
2024-09-12 20:44 ` 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=xmqqv7z5vmk3.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=brianmlyles@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=ps@pks.im \
/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 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 NNTP newsgroup(s).