X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fbaredebian-multitar;h=9ce59575d7c000bee7e2c5eaf938bd1eb1ab4582;hb=de2f667ab9664f312a2f66089f5253e38c984625;hp=74ad64af507b24a97f613a86659b0a198026a033;hpb=2186de0a5e3cddca4f7b30a6ab1eee928b332785;p=dgit.git

diff --git a/tests/tests/baredebian-multitar b/tests/tests/baredebian-multitar
index 74ad64af..9ce59575 100755
--- a/tests/tests/baredebian-multitar
+++ b/tests/tests/baredebian-multitar
@@ -20,4 +20,26 @@ git tag -d $uvtag
 
 baredebian-test-core
 
+combine=$(
+	git log --pretty=format:%H \
+	--grep "Combine orig tarballs for example $uv" split.p
+)
+
+parentnum=0
+for comp in '' $xorigcomps; do
+	parentnum=$(( $parentnum + 1 ))
+	fn=${origbase}${comp:+-}${comp}.tar.gz
+
+	git checkout --orphan imp$parentnum
+	git rm -rf .
+	tar --strip-components=1 -axf ../$fn
+	git add -Af .
+
+	git commit -m P$parentnum
+	git diff --stat --exit-code $combine^$parentnum
+
+	count=$(git log $combine^$parentnum | grep -Fc $fn)
+	[ $count = 2 ]
+done
+
 t-ok