[LEDE-DEV] [PATCH] scripts/feeds: use git rev-parse for getting revision
Rafał Miłecki
zajec5 at gmail.com
Wed Nov 2 06:36:19 PDT 2016
From: Rafał Miłecki <rafal at milecki.pl>
It provides simpler output so we don't need extra head and cut commands.
Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
---
scripts/feeds | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/feeds b/scripts/feeds
index 481eb9b..81cf1f0 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.10.1
More information about the Lede-dev
mailing list