summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-06 16:57:25 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-06 16:57:25 +0000
commit01f75814247b00ca34c3ff0a2d793b3f70d7862b (patch)
tree11434df2e5662db889846e3cbeb8b317c1217ef7 /scripts
parent2ad1d18700611d6e81d4feb6ea36140c1e6f2fe4 (diff)
scripts/feeds: support checking out git trees with different branches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24285 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/feeds8
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/feeds b/scripts/feeds
index 84f97feeb6..9f773df9ed 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -114,6 +114,7 @@ my %update_method = (
'update' => ""},
'src-git' => {
'init' => "git clone --depth 1 '%s' '%s'",
+ 'init_branch' => "git clone --depth 1 --branch '%s' '%s' '%s'",
'update' => "git pull",
'controldir' => ".git"},
'src-bzr' => {
@@ -143,10 +144,15 @@ sub update_feed_via($$$$) {
my $localpath = "./feeds/$name";
my $safepath = $localpath;
$safepath =~ s/'/'\\''/;
+ my ($base, $branch) = split(/;/, $src, 2);
if( $relocate || !$m->{'update'} || !-d "$localpath/$m->{'controldir'}" ) {
system("rm -rf '$safepath'");
- system(sprintf($m->{'init'}, $src, $safepath)) == 0 or return 1;
+ 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;
+ }
} else {
system("cd '$safepath'; $m->{'update'}") == 0 or return 1;
}