scripts/feeds: support checking out git trees with different branches
SVN-Revision: 24285
This commit is contained in:
parent
163c424187
commit
3945267a99
@ -114,6 +114,7 @@ my %update_method = (
|
|||||||
'update' => ""},
|
'update' => ""},
|
||||||
'src-git' => {
|
'src-git' => {
|
||||||
'init' => "git clone --depth 1 '%s' '%s'",
|
'init' => "git clone --depth 1 '%s' '%s'",
|
||||||
|
'init_branch' => "git clone --depth 1 --branch '%s' '%s' '%s'",
|
||||||
'update' => "git pull",
|
'update' => "git pull",
|
||||||
'controldir' => ".git"},
|
'controldir' => ".git"},
|
||||||
'src-bzr' => {
|
'src-bzr' => {
|
||||||
@ -143,10 +144,15 @@ sub update_feed_via($$$$) {
|
|||||||
my $localpath = "./feeds/$name";
|
my $localpath = "./feeds/$name";
|
||||||
my $safepath = $localpath;
|
my $safepath = $localpath;
|
||||||
$safepath =~ s/'/'\\''/;
|
$safepath =~ s/'/'\\''/;
|
||||||
|
my ($base, $branch) = split(/;/, $src, 2);
|
||||||
|
|
||||||
if( $relocate || !$m->{'update'} || !-d "$localpath/$m->{'controldir'}" ) {
|
if( $relocate || !$m->{'update'} || !-d "$localpath/$m->{'controldir'}" ) {
|
||||||
system("rm -rf '$safepath'");
|
system("rm -rf '$safepath'");
|
||||||
|
if ($m->{'init_branch'} and $branch) {
|
||||||
|
system(sprintf($m->{'init_branch'}, $branch, $base, $safepath)) == 0 or return 1;
|
||||||
|
} else {
|
||||||
system(sprintf($m->{'init'}, $src, $safepath)) == 0 or return 1;
|
system(sprintf($m->{'init'}, $src, $safepath)) == 0 or return 1;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
system("cd '$safepath'; $m->{'update'}") == 0 or return 1;
|
system("cd '$safepath'; $m->{'update'}") == 0 or return 1;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user