From: Rafał Miłecki <rafal@milecki.pl>
Date: Wed, 2 Nov 2016 13:36:19 +0000 (+0100)
Subject: scripts/feeds: use git rev-parse for getting revision
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0a6439154a384d2782b2da80116a589b67a95f5a;p=openwrt%2Fstaging%2Fkaloz.git

scripts/feeds: use git rev-parse for getting revision

It provides simpler output so we don't need extra head and cut commands.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/scripts/feeds b/scripts/feeds
index 45239af1a3..83007f5e16 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",