tests/update-db-compat: Add filtering of git-srcs

Empirically, this fixes a few more tests, as expected.

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

1 files changed, 35 insertions, 0 deletions

diff --git a/tests/update-dh-compat b/tests/update-dh-compat
index 0c6516f..9d1191c 100755
--- a/tests/update-dh-compat
+++ b/tests/update-dh-compat
@@ -35,6 +35,25 @@ cd_fresh_d () {
 adjust="$toplevel"/tests/update-dh-compat-adjust
 adjust () { "$adjust"; }
 
+adjust_git_filter () {
+    # this is the dgit origin commit; this check may stop
+    # us rewriting our normal dgit tree
+    set +e
+    git cat-file -e 06fb75074c0bebccdcf86385b8d248fd127ed66d
+    rc=$?
+    set -e
+    test $rc = 1
+
+    git filter-branch					\
+	--tree-filter "$adjust"				\
+	--tag-name-filter cat				\
+	-- --all
+
+    git for-each-ref refs/original \
+	--format '%(refname)' |
+	xargs -rn1 git update-ref -d
+}
+
 cd "$toplevel"
 
 for f in tests/pkg-srcs/*.dsc; do
@@ -53,4 +72,20 @@ done
 
 cd "$toplevel"
 
+for f in tests/git-srcs/*.tar; do
+    cd_fresh_d
+
+    tar xf ../$f
+
+    p=$(echo *)
+    cd $p
+    adjust_git_filter
+    cd ..
+    tar cf ../$f $p
+
+    cd ..
+done
+
+cd "$toplevel"
+
 rm -rf d