When tripping over a GIT_ var, give a useful error

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index 53ef564791a62e735978a5709a6aab3dbfc94abe..428071e3c1cbd41986e4d7988e09462e42f7bfbe 100755 (executable)
--- a/builder.sh
+++ b/builder.sh
@@ -1698,9 +1698,9 @@ build_package() {
        # this may be set by user
        unset GIT_SSH
        # may be set by user
-       unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_TESTING_PORCELAIN_COMMAND_LIST
+       unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_TESTING_PORCELAIN_COMMAND_LIST GIT_EDITOR
        # fail if something still set
-       env | grep ^GIT_ && Exit_error err_build_fail
+       env | grep ^GIT_ && Exit_error err_build_fail "One of GIT_* env variables is still set. The builder script needs to be updated to unset that variable. In the meantime, unset it manually."
 
        local specdir=$(insert_gitlog $SPECFILE)
        ulimit -c unlimited