From ab02d391cb6cd46d16407ccdd9b9dda4240e4e0b Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Mon, 31 Jul 2023 16:47:07 +0200 Subject: [PATCH] test: use only rev-parse for getting the current branch Signed-off-by: Valerio Setti --- docs/architecture/psa-migration/outcome-analysis.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/docs/architecture/psa-migration/outcome-analysis.sh b/docs/architecture/psa-migration/outcome-analysis.sh index d03c5a2262..1805a3ca0e 100755 --- a/docs/architecture/psa-migration/outcome-analysis.sh +++ b/docs/architecture/psa-migration/outcome-analysis.sh @@ -44,14 +44,10 @@ record() { } # save current HEAD. -# Note: unfortunately "git branch --show-current" was added only in GIT -# version 2.22. -GIT_VERSION="$(git --version | sed 's/git version //')" -if dpkg --compare-versions "$GIT_VERSION" "gt" "2.22.0"; then - HEAD=$(git branch --show-current) -else - HEAD=$(git rev-parse --abbrev-ref HEAD) -fi +# Note: this can optionally be updated to +# HEAD=$(git branch --show-current) +# when using a Git version above 2.22 +HEAD=$(git rev-parse --abbrev-ref HEAD) # get the numbers before this PR for default and full cleanup