handle --force when checking for incorrect password

Author: andreineculau

CHANGELOG.md

@@ -34,6 +34,11 @@ system, you must also run the `--upgrade` command in each repository:
 
 ## [Unreleased]
 
+### Changed
+
+- Improve check for incorrect password to avoid false report when transcrypt
+  init is run with --force in a repo containing dirty files (#196)
+
 ### Fixed
 
 - Fix pre-commit hook to use "fast" multi-threaded mode for Bash versions 5+ as

transcrypt

@@ -1596,6 +1596,13 @@ elif [[ $cipher ]]; then
 	validate_cipher
 fi
 
+list_dirty_files() {
+	{ git diff-index --name-status HEAD -- || git diff-index --stat HEAD -- || git diff-index HEAD -- || true; } 2>/dev/null
+}
+
+# shellcheck disable=SC2155
+readonly GIT_DIRTY_FILES_BEFORE_INIT="$(list_dirty_files | grep $'\n' -c)"
+
 # perform function calls to configure transcrypt
 get_cipher
 get_password
@@ -1620,12 +1627,10 @@ if [[ ! -f $GIT_ATTRIBUTES ]]; then
 	printf '#pattern  filter=crypt diff=crypt merge=crypt\n' >"$GIT_ATTRIBUTES"
 fi
 
-# check for modified (dirty) files after transcrypt configuration which could
+# check for newly modified (dirty) files after transcrypt configuration which could
 # indicate an incorrect password
-#
-# check if the repo is dirty
-if git status --porcelain 2>/dev/null | grep "^ M" >/dev/null; then
-	die 1 'Unexpected dirty files in the repository when configured by transcrypt%s, check your password.\n' "$CONTEXT_DESCRIPTION"
+if [[ ${GIT_DIRTY_FILES_BEFORE_INIT} -lt $(list_dirty_files | grep $'\n' -c) ]]; then
+	die 1 'Unexpected new dirty files in the repository when configured by transcrypt%s, please check your password.\n' "$CONTEXT_DESCRIPTION"
 fi
 
 printf 'The repository has been successfully configured by transcrypt%s.\n' "$CONTEXT_DESCRIPTION"