From 0a6439154a384d2782b2da80116a589b67a95f5a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 2 Nov 2016 14:36:19 +0100 Subject: [PATCH] scripts/feeds: use git rev-parse for getting revision MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It provides simpler output so we don't need extra head and cut commands. Signed-off-by: Rafał Miłecki --- scripts/feeds | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/feeds b/scripts/feeds index 45239af1a337..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", -- 2.30.2