diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-12-02 11:00:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-02 11:00:45 -0800 |
| commit | ada59fcd3230e661bc1110702a2fb4ef76371bc1 (patch) | |
| tree | a700bdf88015f1cbfcccaf4e006f8847a4bc8025 | |
| parent | Update draft release notes for 1.5.4 (diff) | |
| parent | t9600: test cvsimport from CVS working tree (diff) | |
| download | tgif-ada59fcd3230e661bc1110702a2fb4ef76371bc1.tar.xz | |
Merge branch 'maint'
* maint:
t9600: test cvsimport from CVS working tree
| -rwxr-xr-x | t/t9600-cvsimport.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh index 29fee2dd13..08f0f2a3a3 100755 --- a/t/t9600-cvsimport.sh +++ b/t/t9600-cvsimport.sh @@ -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 |