diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-01-05 13:30:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-05 13:30:29 -0800 |
| commit | 0c30ed0cb57988378d721d817c55f74a93dffb13 (patch) | |
| tree | 7e60371081112e52dda1e80f2b29228d97aaacde /t | |
| parent | f2665ec9fa42b75d92d0301cff85362836c5729a (diff) | |
| parent | 60d5985dab5d3c5a283f060414b903778adfd09a (diff) | |
| download | git-0c30ed0cb57988378d721d817c55f74a93dffb13.tar.gz git-0c30ed0cb57988378d721d817c55f74a93dffb13.tar.xz | |
Merge branch 'mg/cvsimport'
* mg/cvsimport:
cvsimport: handle the parsing of uppercase config options
cvsimport: partial whitespace cleanup
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9600-cvsimport.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh index 432b82e3d..4c384ff02 100755 --- a/t/t9600-cvsimport.sh +++ b/t/t9600-cvsimport.sh @@ -89,7 +89,8 @@ EOF test_expect_success PERL 'update git module' ' (cd module-git && - git cvsimport -a -R -z 0 module && + git config cvsimport.trackRevisions true && + git cvsimport -a -z 0 module && git merge origin ) && test_cmp module-cvs/o_fortuna module-git/o_fortuna @@ -117,7 +118,8 @@ test_expect_success PERL 'cvsimport.module config works' ' (cd module-git && git config cvsimport.module module && - git cvsimport -a -R -z0 && + git config cvsimport.trackRevisions true && + git cvsimport -a -z0 && git merge origin ) && test_cmp module-cvs/tick module-git/tick @@ -137,6 +139,7 @@ test_expect_success PERL 'import from a CVS working tree' ' $CVS co -d import-from-wt module && (cd import-from-wt && + git config cvsimport.trackRevisions false && git cvsimport -a -z0 && echo 1 >expect && git log -1 --pretty=format:%s%n >actual && |