From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 15 Feb 2020 22:05:52 +0000 (+0000)
Subject: pretest-to-tested: Do not descend into subtree histories
X-Git-Tag: v0.6.0~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=62c670a6ef8c7506dbbeff850061f42e06e68ed9;p=secnet.git

pretest-to-tested: Do not descend into subtree histories

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/pretest-to-tested b/pretest-to-tested
index 7166486..fea6e97 100755
--- a/pretest-to-tested
+++ b/pretest-to-tested
@@ -4,9 +4,15 @@
 # example runes in main tree:
 #  git-branch -f pretest && git-branch -f tested `git-merge-base HEAD tested` && git-checkout wip
 
+stl=''
+for subtree in base91-c subdirmk base91-python; do
+    st=$(git-subtree split -P $subtree pretest)
+    stl+=" ^$st"
+done
+
 set -e
 while true; do
-    next=$(git-rev-list --reverse tested..pretest | head -n1)
+    next=$(git-rev-list --reverse $stl tested..pretest | head -n1)
     if [ "x$next" = x ]; then break; fi
     git checkout "$next"
     ./comprehensive-test