diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2010-12-29 21:55:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-04 21:31:03 (GMT) |
| commit | 60d5985dab5d3c5a283f060414b903778adfd09a (patch) | |
| tree | 7c494f82042a233769d40a62b0fac9aa396a3868 /t | |
| parent | 549ad6d2f3a7090d6f73f8ebacd5d1db7a0cf90f (diff) | |
| download | git-60d5985dab5d3c5a283f060414b903778adfd09a.zip git-60d5985dab5d3c5a283f060414b903778adfd09a.tar.gz git-60d5985dab5d3c5a283f060414b903778adfd09a.tar.bz2 | |
cvsimport: handle the parsing of uppercase config options
The current code leads to
fatal: bad config value for 'cvsimport.r' in .git/config
for a standard use case with cvsimport.r set.
cvsimport sets internal variables by checking the config for each
possible command line option. The problem is that config items are case
insensitive, so config.r and config.R are the same. The ugly error is
due to that fact that cvsimport expects a bool for -R (and thus
config.R) but a remote name for -r (and thus config.r).
Fix this by making cvsimport expect long names for uppercase options.
config options for cvsimport have been undocumented so far, though
present in the code and advertised in several tutorials. So one may read
"enhance" for "fix". Similarly, the names for the options are
"documented" in the code, waitiing for their lowercase equivalents to be
transformed into long config options, as well.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 432b82e..4c384ff 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 && |