From: "Tom Clarkson via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Avery Pennarun <apenwarr@gmail.com>, Tom Clarkson <tom@tqclarkson.com>
Subject: [PATCH 0/7] subtree: Fix handling of complex history
Date: Mon, 11 May 2020 05:49:54 +0000 [thread overview]
Message-ID: <pull.493.git.1589176201.gitgitgadget@gmail.com> (raw)
Fixes several issues that could occur when running subtree split on large
repos with more complex history.
1. A merge commit could bypass the known start point of the subtree, which
would cause the entire history to be processed recursively, leading to a
stack overflow / segfault after reading a few hundred commits. Older
commits are now explicitly recorded as irrelevant so that the recursive
process can terminate on any mainline commit rather than only on subtree
joins and initial commits.
2. It is possible for a repo to contain subtrees that lack the metadata
that is usually present in add/join commit messages (git-svn at least
can produce such a structure). The new use/ignore/map commands allow the
user to provide that information for any problematic commits.
3. A mainline commit that does not contain the subtree folder could be
erroneously identified as a subtree commit, which would add the entire
mainline history to the subtree. Commits will now only be used as is if
all their parents are already identified as subtree commits. While the
new code can still be tripped up by unusual folder structures, the
completely unambiguous solution turned out to involve a significant
performance penalty, and the new ignore / use commands provide a
workaround for that scenario.
Tom Clarkson (7):
subtree: handle multiple parents passed to cache_miss
subtree: exclude commits predating add from recursive processing
subtree: persist cache between split runs
subtree: add git subtree map command
subtree: add git subtree use and ignore commands
subtree: more robustly distinguish subtree and mainline commits
subtree: document new subtree commands
contrib/subtree/git-subtree.sh | 185 ++++++++++++++++++++++++++------
contrib/subtree/git-subtree.txt | 24 +++++
2 files changed, 177 insertions(+), 32 deletions(-)
base-commit: af6b65d45ef179ed52087e80cb089f6b2349f4ec
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-493%2Ftqc%2Ftqc%2Fsubtree-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-493/tqc/tqc/subtree-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/493
--
gitgitgadget
next reply other threads:[~2020-05-11 5:50 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-11 5:49 Tom Clarkson via GitGitGadget [this message]
2020-05-11 5:49 ` [PATCH 1/7] subtree: handle multiple parents passed to cache_miss Tom Clarkson via GitGitGadget
2020-05-11 5:49 ` [PATCH 2/7] subtree: exclude commits predating add from recursive processing Tom Clarkson via GitGitGadget
2020-05-11 5:49 ` [PATCH 3/7] subtree: persist cache between split runs Tom Clarkson via GitGitGadget
2020-05-11 5:49 ` [PATCH 4/7] subtree: add git subtree map command Tom Clarkson via GitGitGadget
2020-05-11 5:49 ` [PATCH 5/7] subtree: add git subtree use and ignore commands Tom Clarkson via GitGitGadget
2020-05-11 5:50 ` [PATCH 6/7] subtree: more robustly distinguish subtree and mainline commits Tom Clarkson via GitGitGadget
2020-05-11 5:50 ` [PATCH 7/7] subtree: document new subtree commands Tom Clarkson via GitGitGadget
2020-10-04 17:52 ` [PATCH 0/7] subtree: Fix handling of complex history Ed Maste
2020-10-04 19:27 ` Johannes Schindelin
2020-10-05 16:47 ` Junio C Hamano
2020-10-05 21:37 ` Ed Maste
2020-10-07 16:31 ` Johannes Schindelin
2020-10-06 22:05 ` [PATCH v2 " Tom Clarkson via GitGitGadget
2020-10-06 22:05 ` [PATCH v2 1/7] subtree: handle multiple parents passed to cache_miss Tom Clarkson via GitGitGadget
2020-10-07 13:12 ` Ed Maste
2020-10-06 22:05 ` [PATCH v2 2/7] subtree: exclude commits predating add from recursive processing Tom Clarkson via GitGitGadget
2020-10-07 15:36 ` Johannes Schindelin
2020-10-06 22:05 ` [PATCH v2 3/7] subtree: persist cache between split runs Tom Clarkson via GitGitGadget
2020-10-07 16:06 ` Johannes Schindelin
2020-10-06 22:05 ` [PATCH v2 4/7] subtree: add git subtree map command Tom Clarkson via GitGitGadget
2020-10-06 22:05 ` [PATCH v2 5/7] subtree: add git subtree use and ignore commands Tom Clarkson via GitGitGadget
2020-10-07 16:29 ` Johannes Schindelin
2020-10-06 22:05 ` [PATCH v2 6/7] subtree: more robustly distinguish subtree and mainline commits Tom Clarkson via GitGitGadget
2020-10-07 19:42 ` Johannes Schindelin
2020-10-06 22:05 ` [PATCH v2 7/7] subtree: document new subtree commands Tom Clarkson via GitGitGadget
2020-10-07 19:43 ` Johannes Schindelin
2020-10-07 19:46 ` [PATCH v2 0/7] subtree: Fix handling of complex history Johannes Schindelin
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=pull.493.git.1589176201.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=tom@tqclarkson.com \
--subject='Re: [PATCH 0/7] subtree: Fix handling of complex history' \
/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
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).