cvsimport: fix usage of cvsimport.module

There were two problems:

1. We only look at the config variable if there is no module
given on the command line. We checked this by comparing
@ARGV == 0. However, at the time of the comparison, we
have not yet parsed the dashed options, meaning that
"git cvsimport" would read the variable but "git
cvsimport -a" would not. This is fixed by simply moving
the check after the call to getopt.

2. If the config variable did not exist, we were adding an
empty string to @ARGV. The rest of the script, rather
than barfing for insufficient input, would then try to
import the module '', leading to rather confusing error
messages. Based on patch from Emanuele Giaquinta.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index d29b547d2670eb1a3c4d3290ab10939cf652497a..d565091c35b1931035bbfdf455efec38fde51833 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -108,10 +108,6 @@ sub read_repo_config {
             }
                }
        }
             }
                }
        }

-    if (@ARGV == 0) {
-        chomp(my $module = `git-repo-config --get cvsimport.module`);
-        push(@ARGV, $module);
-    }

 }
 
 my $opts = "haivmkuo:d:p:r:C:z:s:M:P:A:S:L:";
 }
 
 my $opts = "haivmkuo:d:p:r:C:z:s:M:P:A:S:L:";


@@ -119,6 +115,10 @@ sub read_repo_config {
 getopts($opts) or usage();
 usage if $opt_h;
 
 getopts($opts) or usage();
 usage if $opt_h;
 

+if (@ARGV == 0) {
+               chomp(my $module = `git-repo-config --get cvsimport.module`);
+               push(@ARGV, $module) if $? == 0;
+}

 @ARGV <= 1 or usage("You can't specify more than one CVS module");
 
 if ($opt_d) {
 @ARGV <= 1 or usage("You can't specify more than one CVS module");
 
 if ($opt_d) {

diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 3338d447c5b7b43ac274e6966ee693611f5e8056..29fee2dd13c6826338e92bf6e61cc39b057da444 100755 (executable)
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -98,4 +98,25 @@ test_expect_success 'update git module' '
 
 '
 
 
 '
 

+test_expect_success 'update cvs module' '
+
+       cd module-cvs &&
+               echo 1 >tick &&
+               cvs add tick &&
+               cvs commit -m 1
+       cd ..
+
+'
+
+test_expect_success 'cvsimport.module config works' '
+
+       cd module-git &&
+               git config cvsimport.module module &&
+               git cvsimport -a -z0 &&
+               git merge origin &&
+       cd .. &&
+       git diff module-cvs/tick module-git/tick
+
+'
+

 test_done
 test_done