[PATCH 3/3] contrib/subtree: reduce recursion during split
On Debian-alikes, POSIX sh has a hardcoded recursion depth of 1000. This limit operates like bash's `$FUNCNEST` [1], but it does not actually respect `$FUNCNEST`. This is non-standard behavior. On other distros, the sh recursion depth is limited only by the available stack size.
With certain history graphs, subtree splits are recursive—with one recursion per commit. Attempting to split complex repos that have thousands of commits, like [2], may fail on these distros.
Reduce the amount of recursion required by eagerly discovering the complete range of commits to process.
The recursion is a side-effect of the rejoin-finder in `find_existing_splits`. Rejoin mode, as in
git subtree split --rejoin -b hax main ...
improves the speed of later splits by merging the split history back into `main`. This gives the splitting algorithm a stopping point. The rejoin maps one commit on `main` to one split commit on `hax`. If we encounter this commit, we know that it maps to `hax`.
But this is only a single point in the history. Many splits require history from before the rejoin. See patch content for examples.
If pre-rejoin history is required, `check_parents` recursively discovers each individual parent, with one recursion per commit. The recursion deepens the entire tree, even if an older rejoin is available. This quickly overwhelms the Debian sh stack.
Instead of recursively processing each commit, process *all* the commits back to the next obvious starting point: i.e., either the next-oldest --rejoin or the beginning of history. This is where the recursion is likely to stop anyway.
While this still requires recursion, it is *considerably* less recursive.
[1]: https://www.gnu.org/software/bash/manual/html_node/Bash-Variables.html#index-FUNCNEST
[2]: https://github.com/christian-heusel/aur.git
Signed-off-by: Colin Stagner <ask+git@howdoi.land>
---
contrib/subtree/git-subtree.sh | 56 ++++++++++++++++++++++++++++++++--
1 file changed, 54 insertions(+), 2 deletions(-)
Show changes to contrib/subtree/git-subtree.sh +54 −2
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 7a62ef7504..54d7151a50 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -312,6 +312,46 @@ cache_miss () {
}
# Usage: check_parents [REVS...]
+#
+# During a split, check that every commit in REVS has already been
+# processed via `process_split_commit`. If not, deepen the history
+# until it is.
+#
+# Commits authored by `subtree split` have to be created in the
+# same order as every other git commit: ancestor-first, with new
+# commits building on old commits. The traversal order normally
+# ensures this is the case, but it also excludes --rejoins commits
+# by default.
+#
+# The --rejoin tells us, "this mainline commit is equivalent to
+# this split commit." The relationship is only known for that
+# exact commit---and not before or after it. Frequently, commits
+# prior to a rejoin are not needed... but, just as often, they
+# are! Consider this history graph:
+#
+# --D---
+# / \
+# A--B--C--R--X--Y main
+# / /
+# a--b--c / split
+# \ /
+# --e--/
+#
+# The main branch has commits A, B, and C. main is split into
+# commits a, b, and c. The split history is rejoined at R.
+#
+# There are at least two cases where we might need the A-B-C
+# history that is prior to R:
+#
+# 1. Commit D is based on history prior to R, but
+# it isn't merged into mainline until after R.
+#
+# 2. Commit e is based on old split history. It is merged
+# back into mainline with a subtree merge. Again, this
+# happens after R.
+#
+# check_parents detects these cases and deepens the history
+# to the next available rejoin.
check_parents () {
missed=$(cache_miss "$@") || exit $?
local indent=$(($indent + 1))
@@ -319,8 +359,20 @@ check_parents () {
do
if ! test -r "$cachedir/notree/$miss"
then
- debug "incorrect order: $miss"
- process_split_commit "$miss" ""
+ debug "found commit excluded by --rejoin: $miss. skipping to the next --rejoin..."
+ unrevs="$(find_existing_splits "$dir" "$miss" "$repository")" || exit 1
+
+ find_commits_to_split "$miss" "$unrevs" |
+ while read -r rev parents
+ do
+ process_split_commit "$rev" "$parents"
+ done
+
+ if ! test -r "$cachedir/$miss" &&
+ ! test -r "$cachedir/notree/$miss"
+ then
+ die "failed to deepen history at $miss"
+ fi
fi
done
}
--
2.43.0