X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fquilt-splitbrains;h=134d243893a0c56b7426267b22894adbe17ff170;hb=15229f292b8539da8b3327be89f34573812540e8;hp=2478465a182818f9d90c7c22b30b4235a1e86198;hpb=d2fa05117e4f4a91db3dd0c383eaffb4ffe1b080;p=dgit.git

diff --git a/tests/tests/quilt-splitbrains b/tests/tests/quilt-splitbrains
index 2478465a..134d2438 100755
--- a/tests/tests/quilt-splitbrains
+++ b/tests/tests/quilt-splitbrains
@@ -2,6 +2,12 @@
 set -e
 . tests/lib
 
+# This test script tests each of the split brain quilt modes, and
+# --quilt=linear, with a tree suitable for each of those, and pushes
+# them in sequence.  The idea is to check that each tree is rejected
+# by the wrong quilt modes, and accepted and processed correctly by
+# the right ones.
+
 t-tstunt-parsechangelog
 
 t-newtag
@@ -52,7 +58,7 @@ Subject: Add .gitignore
 ---
 END
 
-git-diff /dev/null .gitignore >>$pf || test $? = 1
+git diff /dev/null .gitignore >>$pf || test $? = 1
 echo ${pf##*/} >>debian/patches/series
 
 git add debian/patches