From: tionis <git@tionis.dev>
To: git@vger.kernel.org
Subject: Bug: git-subtree: splitting subtree fails when subtree was added, removed and added again
Date: Sun, 11 Feb 2024 21:16:47 +0100 [thread overview]
Message-ID: <1d8fa22c-eb13-4cdb-8499-e19f0dea6b42@tionis.dev> (raw)
I discovered a problem in git-subtree that I could also reproduce in a
minimal proof of concept over at
https://github.com/tionis/git-subtree-bug-poc
The same bug was discussed some time ago on stackoverflow:
https://stackoverflow.com/questions/68761778/git-subtree-cache-exists
It seems to occur when a subtree was added, removed, alter added again
and then modified in some commit.
This leads to some error with the cache leading to an error message like
fatal: cache for $commit-hash-here already exists!
I'm unsure how to work around this other than modify the history or
creating a branch from before the first addition and fixing it there.
reply other threads:[~2024-02-11 20:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1d8fa22c-eb13-4cdb-8499-e19f0dea6b42@tionis.dev \
--to=git@tionis.dev \
--cc=git@vger.kernel.org \
/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).