From 5de3d907a0e7946de73f86a385cdbcb9d142e5cb Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 3 Apr 2019 23:57:24 +0100 Subject: [PATCH] version_utils.sh: Allow .ottdrev-vc to be dirty at release time --- version_utils.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version_utils.sh b/version_utils.sh index c0030f8a50..31827f644d 100755 --- a/version_utils.sh +++ b/version_utils.sh @@ -120,11 +120,11 @@ if [ -n "$WRITE" ]; then fi function unignore_files { - git update-index --no-assume-unchanged README.md jgrpp-changelog.md + git update-index --no-assume-unchanged README.md jgrpp-changelog.md .ottdrev-vc } if [ -n "$RELEASETAG" ]; then - git update-index --assume-unchanged README.md jgrpp-changelog.md + git update-index --assume-unchanged README.md jgrpp-changelog.md .ottdrev-vc trap unignore_files EXIT if ! git diff-index --quiet HEAD; then echo "Repo is dirty, aborting" >&2