From 5bf6b855d4083070390b5c0eb03bca678090d75d Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Wed, 4 Oct 2017 03:46:51 +0200 Subject: fixup! Convert flashrom to git Rename getrevision's local_revision function to just revision. All revisions are local in git and we certainly wont go back to a non-distributed VCS :) Change-Id: I6689ac24077b3981b471ed69de7cc3ef79d435b1 Signed-off-by: Stefan Tauner Reviewed-on: https://review.coreboot.org/21829 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- util/getrevision.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'util/getrevision.sh') diff --git a/util/getrevision.sh b/util/getrevision.sh index 9dd4dbe1..80812b45 100755 --- a/util/getrevision.sh +++ b/util/getrevision.sh @@ -130,8 +130,7 @@ timestamp() { echo "${t}" } -# Retrieve local revision info. -local_revision() { +revision() { local r if git_is_file_tracked "$1" ; then r=$(git describe $(git_last_commit "$1")) @@ -158,8 +157,9 @@ Commands this message -c or --check test if path is under version control at all - -l or --local - local revision information including an indicator for uncommitted changes + -r or --revision + return unique revision information including an indicator for + uncommitted changes -U or --url URL associated with the latest commit -d or --date @@ -188,10 +188,6 @@ main() { -h|--help) action=show_help; shift;; - -l|--local) - check_action $1 - action=local_revision - shift;; -U|--url) check_action $1 action=scm_url @@ -200,6 +196,10 @@ main() { check_action $1 action="timestamp +%Y-%m-%d" # refrain from suffixing 'Z' to indicate it's UTC shift;; + -r|--revision) + check_action $1 + action=revision + shift;; -t|--timestamp) check_action $1 action="timestamp +%Y-%m-%dT%H:%M:%SZ" # There is only one valid time format! ISO 8601 -- cgit v1.2.3