X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=1d189a9203d05785cc0260f6d4fc668a3d06ee2d;hb=1891cf0f12e32d647e24e7da6730e10d48d33fc3;hp=5d8e742dd371aba7cad2dd22ee8908ce93e630f8;hpb=19669291927ee91dbea3c47a412161b32859df88;p=dgit.git diff --git a/tests/lib b/tests/lib index 5d8e742d..1d189a92 100644 --- a/tests/lib +++ b/tests/lib @@ -188,6 +188,8 @@ t-git-merge-base () { } t-has-ancestor () { + # t-has-ancestor ANCESTOR + # (CHILD is implicit, HEAD) local now=`git rev-parse HEAD` local ancestor=`git rev-parse $1^{}` local mbase=`t-git-merge-base $ancestor $now` @@ -278,7 +280,7 @@ t-archive-updated () { t-archive-process-incoming () { local suite=$1 - mv $tmp/incoming/${p}_${v}[._]* $tmp/mirror/pool/main/ + mv $tmp/incoming/${p}_* $tmp/mirror/pool/main/ t-archive-query "$suite" }