cvsimport: remove last use of repo-config from git standard tools
git cvsimport was the last tool to use repo-config instead of config. Update it to use plain git config. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
22fa97d4e0
commit
cfc44a12fe
@ -88,7 +88,7 @@ sub write_author_info($) {
|
|||||||
close ($f);
|
close ($f);
|
||||||
}
|
}
|
||||||
|
|
||||||
# convert getopts specs for use by git-repo-config
|
# convert getopts specs for use by git config
|
||||||
sub read_repo_config {
|
sub read_repo_config {
|
||||||
# Split the string between characters, unless there is a ':'
|
# Split the string between characters, unless there is a ':'
|
||||||
# So "abc:de" becomes ["a", "b", "c:", "d", "e"]
|
# So "abc:de" becomes ["a", "b", "c:", "d", "e"]
|
||||||
@ -96,7 +96,7 @@ sub read_repo_config {
|
|||||||
foreach my $o (@opts) {
|
foreach my $o (@opts) {
|
||||||
my $key = $o;
|
my $key = $o;
|
||||||
$key =~ s/://g;
|
$key =~ s/://g;
|
||||||
my $arg = 'git-repo-config';
|
my $arg = 'git config';
|
||||||
$arg .= ' --bool' if ($o !~ /:$/);
|
$arg .= ' --bool' if ($o !~ /:$/);
|
||||||
|
|
||||||
chomp(my $tmp = `$arg --get cvsimport.$key`);
|
chomp(my $tmp = `$arg --get cvsimport.$key`);
|
||||||
@ -116,7 +116,7 @@ getopts($opts) or usage();
|
|||||||
usage if $opt_h;
|
usage if $opt_h;
|
||||||
|
|
||||||
if (@ARGV == 0) {
|
if (@ARGV == 0) {
|
||||||
chomp(my $module = `git-repo-config --get cvsimport.module`);
|
chomp(my $module = `git config --get cvsimport.module`);
|
||||||
push(@ARGV, $module) if $? == 0;
|
push(@ARGV, $module) if $? == 0;
|
||||||
}
|
}
|
||||||
@ARGV <= 1 or usage("You can't specify more than one CVS module");
|
@ARGV <= 1 or usage("You can't specify more than one CVS module");
|
||||||
|
Reference in New Issue
Block a user