From 40d0c22e28e7aa63045ba9f0c7a717cc453e5e2c Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Thu, 6 Jun 2019 16:53:06 -0300 Subject: mergerelease: add error checking --- mergerelease | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/mergerelease b/mergerelease index 82242753..3288eae2 100755 --- a/mergerelease +++ b/mergerelease @@ -1,18 +1,29 @@ #!/bin/sh [ "$1" ] || { - echo "usage.....: $0 " - echo "example...: $0 release-3.1.0" - echo - echo "Before running this, make sure branch is tagged:" - echo " git tag -s v3.1.0" - echo " git push origin v3.1.0" + echo "usage.....: $0 " + echo "example...: $0 3.1.3" echo exit 1 } v="$1" +git show $v &> /dev/null || { + echo "There is no release branch $v" + exit 1 +} + +git show origin v$v &> /dev/null || { + echo "There is no pushed tag v$v in origin." + echo + echo "Before running this, make sure branch is tagged:" + echo " git tag -s v$v" + echo " git push origin v$v" + echo + exit 1 +} + git fetch --all git checkout master git diff master $v > version.diff -- cgit v1.2.3-55-g6feb