X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=scripts%2Ffeeds;h=83007f5e167e21edd3a84123f3d3b630c004ec07;hb=0a5ccfbadda79f4626202b78326c4d3ffccf9bd1;hp=d1f3824057cf7889bb6d444e1d7bc1cfddbcacc7;hpb=a2944a0c09b8486878482590b3409a3c0c710591;p=openwrt%2Fstaging%2Fblogic.git

diff --git a/scripts/feeds b/scripts/feeds
index d1f3824057cf..83007f5e167e 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -130,19 +130,19 @@ my %update_method = (
 		'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'"},
+		'revision'	=> "git rev-parse --short HEAD | 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'"},
+		'revision'	=> "git rev-parse --short HEAD | tr -d '\n'"},
 	'src-gitsvn' => {
 		'init'	=> "git svn clone -r HEAD '%s' '%s'",
 		'update'	=> "git svn rebase",
 		'controldir'	=> ".git",
-		'revision'	=> "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"},
+		'revision'	=> "git rev-parse --short HEAD | tr -d '\n'"},
 	'src-bzr' => {
 		'init'		=> "bzr checkout --lightweight '%s' '%s'",
 		'update'	=> "bzr update",
@@ -333,7 +333,7 @@ sub list {
 			my $localpath = "./feeds/$feed->[1]";
 			my $m = $update_method{$feed->[0]};
 			my $revision;
-			if( !$m->{'revision'} ) {
+			if (!-d "$localpath" || !$m->{'revision'}) {
 				$revision = "X";
 			}
 			elsif( $m->{'controldir'} && -d "$localpath/$m->{'controldir'}" ) {