X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-gdr;h=7b4f0858afece955e7ce5a969001e933ee0a9b21;hp=9eb75371102f14e4648f8bef5d12f0d907c462db;hb=6af86bd0c71d0d3dfa84ef03ff121939d804dbde;hpb=4eee70a2b1710c1a8fc71fbd3cdc7064682a799c diff --git a/tests/lib-gdr b/tests/lib-gdr index 9eb75371..7b4f0858 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -155,21 +155,34 @@ t-gdr-good () { t-some-changes () { local token=$1 + local which=${2-dum} t-git-next-date - echo >>debian/zorkmid "// debian $token" - git add debian/zorkmid - git commit -m "DEBIAN add zorkmid ($token)" + case "$which" in + *d*) + echo >>debian/zorkmid "// debian $token" + git add debian/zorkmid + git commit -m "DEBIAN add zorkmid ($token)" + ;; + esac - echo >>src.c "// upstream $token" - git commit -a -m "UPSTREAM edit src.c ($token)" + case "$which" in + *u*) + echo >>src.c "// upstream $token" + git commit -a -m "UPSTREAM edit src.c ($token)" + ;; + esac - for f in debian/zorkmid src.c; do - echo "// both! $token" >>$f - git add $f - done - git commit -m "MIXED add both ($token)" + case "$which" in + *m*) + for f in debian/zorkmid src.c; do + echo "// both! $token" >>$f + git add $f + done + git commit -m "MIXED add both ($token)" + ;; + esac t-git-next-date }