From 2f6fa5e4e27189930fab6d80d75a4689ebe2cfe8 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Fri, 10 Aug 2018 13:25:59 -0500 Subject: [PATCH] Skip .gitreview review when unnecessary This allows the process to run more than once in a given repo without erroring on the already-patched .gitreview checkout. Change-Id: Iebdf64c87d0ec497b16ce66c48c0c5e4dee5554e Signed-off-by: Dean Troyer --- release/branch-stx.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/release/branch-stx.sh b/release/branch-stx.sh index 7530825b..734bd567 100755 --- a/release/branch-stx.sh +++ b/release/branch-stx.sh @@ -57,12 +57,14 @@ function update_gitreview { defaultbranch=$branch" echo "$grcontents" > .gitreview git add .gitreview - git commit -s -m "Update .gitreview for $branch" - git show - if [[ -z $DRY_RUN ]]; then - git review -t "create-${branch}" + if ! git commit -s -m "Update .gitreview for $branch"; then + if [[ -z $DRY_RUN ]]; then + git review -t "create-${branch}" + else + echo "### skipping .gitreview submission to $branch" + fi else - echo "### skipping review submission to $branch" + echo "### no changes required for .gitreview" fi }