Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/30341 )
Change subject: util/release/genrelnotes: Don't assume we're on origin/master ......................................................................
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 pgeorgi@google.com Reviewed-on: https://review.coreboot.org/c/30341 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Martin Roth martinroth@google.com --- M util/release/genrelnotes 1 file changed, 1 insertion(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Martin Roth: Looks good to me, approved
diff --git a/util/release/genrelnotes b/util/release/genrelnotes index ee4bd25..6d5aa52 100755 --- a/util/release/genrelnotes +++ b/util/release/genrelnotes @@ -39,8 +39,7 @@ 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