From 096e0465563c15bba62f225b66cbc9245fe1a6c4 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 5 Nov 2020 16:46:32 +0100 Subject: [PATCH] merge_helpers.sh: Introduce NO_REQUIRE_CLEAN_GIT env var Change-Id: I278b39959c93d95869414ab00577953422057e28 --- merge_helpers.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/merge_helpers.sh b/merge_helpers.sh index 81d712ab2d..0eba6911e2 100755 --- a/merge_helpers.sh +++ b/merge_helpers.sh @@ -11,6 +11,9 @@ revert_last() { } require_clean_git() { + if [ "$NO_REQUIRE_CLEAN_GIT" = "y" ]; then + return + fi uncommitted=`git status --porcelain` if [ ! -z "$uncommitted" ]; then echo "Uncommitted changes are present, please commit first!"