Merge branch 'maint'

* maint:
  t9600: test cvsimport from CVS working tree
This commit is contained in:
Junio C Hamano 2007-12-02 11:00:45 -08:00
commit ada59fcd32

View File

@ -119,4 +119,16 @@ test_expect_success 'cvsimport.module config works' '
'
test_expect_success 'import from a CVS working tree' '
cvs co -d import-from-wt module &&
cd import-from-wt &&
git cvsimport -a -z0 &&
echo 1 >expect &&
git log -1 --pretty=format:%s%n >actual &&
git diff actual expect &&
cd ..
'
test_done