From: Phillip Wood <phillip.wood123@gmail.com>
To: "herr.kaste" <herr.kaste@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Cc: Derrick Stolee <derrickstolee@github.com>
Subject: Re: rebase -i --update-refs can lead to deletion of branches
Date: Thu, 3 Nov 2022 09:32:19 +0000 [thread overview]
Message-ID: <16a8a331-f012-7dae-de1e-f03da95ecb6e@dunelm.org.uk> (raw)
In-Reply-To: <CAFzd1+5F4zqQ1CNeY2xaaf0r__JmE4ECiBt5h5OdiJHbaE78VA@mail.gmail.com>
Hi Caspar
On 20/10/2022 18:01, herr.kaste wrote:
> Hi,
>
> I have the following:
>
> While doing a
>
> `$ git rebase --interactive --update-refs X`
>
> I *removed* the "update-ref" lines from the todo list. The rebase runs
> as expected and prints e.g.
>
> ```
> Successfully rebased and updated refs/heads/test.
> Updated the following refs with --update-refs:
> refs/heads/master
> refs/heads/permissive-interactive-rebase
> refs/heads/variable-annotations-meta-block
> ```
>
> After that all refs have been removed/deleted.
>
> ```
> $ git branch --list
> * test
> ```
>
> Now, I should just have not used `--update-refs` in the first place but anyway
> I decide late that I rather don't want to update "master" etc. and it should
> probably not delete the local refs.
>
> Actually, I so love the new feature that I switched it *on* by default, and just
> wanted to overwrite the behavior in the todo editor.
Sorry for the slow reply, I'm afraid I still haven't found time to look
at this. As far as I can remember deleting the "update-ref" lines should
leave the ref unchanged. I've cc'd the author to see if they have any
insight into what is going on
Best Wishes
Phillip
> Regards
> Caspar Duregger
next prev parent reply other threads:[~2022-11-03 9:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-20 17:01 rebase -i --update-refs can lead to deletion of branches herr.kaste
2022-10-20 20:49 ` Erik Cervin Edin
2022-11-03 9:32 ` Phillip Wood [this message]
2022-11-03 15:25 ` herr.kaste
2022-11-03 16:52 ` Erik Cervin Edin
2022-11-04 0:31 ` Victoria Dye
2022-11-04 10:40 ` Phillip Wood
2022-11-04 15:28 ` Victoria Dye
2022-11-04 16:57 ` [PATCH] rebase --update-refs: avoid unintended ref deletion Victoria Dye
2022-11-04 19:44 ` Taylor Blau
2022-11-04 20:17 ` Phillip Wood
2022-11-04 20:12 ` Phillip Wood
2022-11-07 2:39 ` Derrick Stolee
2022-11-07 17:47 ` [PATCH v2] " Victoria Dye
2022-11-07 19:17 ` Taylor Blau
2022-11-07 19:25 ` Derrick Stolee
2022-11-08 9:58 ` Phillip Wood
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=16a8a331-f012-7dae-de1e-f03da95ecb6e@dunelm.org.uk \
--to=phillip.wood123@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=herr.kaste@gmail.com \
--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.
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).