From 35c8dcf9922328e9259226cd8d99219e96bb06ec Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 20 Dec 2018 17:17:55 +0100 Subject: [PATCH] util/release/genrelnotes: Don't assume we're on origin/master A release may be done from an older commit. It's also not a problem as commits are stored in the reflog (unlike local changes that the script guards properly). Change-Id: I26f1c16c1cdfc9e77e28528b3327ce30c5b82b19 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/c/30341 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- util/release/genrelnotes | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/util/release/genrelnotes b/util/release/genrelnotes index ee4bd25e43..6d5aa522d4 100755 --- a/util/release/genrelnotes +++ b/util/release/genrelnotes @@ -39,8 +39,7 @@ then fi # Try to verify that the repo is clean before losing state. -if ! git diff-index --quiet --cached HEAD 2>/dev/null || \ - [ "$(git diff origin/master --shortstat 2>/dev/null | tail -n1)" != "" ]; then +if ! git diff-index --quiet --cached HEAD 2>/dev/null; then echo "ERROR: repo is not clean. Exiting." exit 1 fi