X-Git-Url: http://git.archive.openwrt.org/?p=14.07%2Fopenwrt.git;a=blobdiff_plain;f=scripts%2Ffeeds;fp=scripts%2Ffeeds;h=be1bebd29eaf8deeb1223a15caba57dc562ceb81;hp=26c2de09452bbf1ddfec614638123a380b0a7a04;hb=e79c72f42c5e93eaa3247a26352c1448edaa1008;hpb=e92cb472a3b9747b8763d3511c4a73947ef87f51

diff --git a/scripts/feeds b/scripts/feeds
index 26c2de0..be1bebd 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -49,7 +49,7 @@ sub parse_config() {
 		$line++;
 
 		my $valid = 1;
-		$line[0] =~ /^src-\w+$/ or $valid = 0;
+		$line[0] =~ /^src-[\w-]+$/ or $valid = 0;
 		$line[1] =~ /^\w+$/ or $valid = 0;
 		@src = split /\s+/, $line[2];
 		$valid or die "Syntax error in feeds.conf, line: $line\n";
@@ -124,6 +124,13 @@ my %update_method = (
 		'update'	=> "git pull --ff",
 		'controldir'	=> ".git",
 		'revision'	=> "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"},
+	'src-git-full' => {
+		'init'          => "git clone '%s' '%s'",
+		'init_branch'   => "git clone --branch '%s' '%s' '%s'",
+		'init_commit'   => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -",
+		'update'	=> "git pull --ff",
+		'controldir'	=> ".git",
+		'revision'	=> "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"},
 	'src-gitsvn' => {
 		'init'	=> "git svn clone -r HEAD '%s' '%s'",
 		'update'	=> "git svn rebase",