Improve command hint to fix secret files not encrypted in index (#120) (#130)

* Disable overly fussy shellcheck rule SC2155 for old code
* Update expected test output to match changed command hint

Code that's been unchanged for years is suddenly being flagged by
rule SC2155; perhaps this rule is stricter in newer versions of
`shellcheck` or action https://github.com/luizm/action-sh-checker ?

Fixes linting failures due to:

    SC2155: Declare and assign separately to avoid masking return values.

Author: jmurty

CHANGELOG.md

@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog][1], and this project adheres to
 - Respect Git `core.hooksPath` setting when installing the pre-commit hook. (#104)
 - Zsh completion. (#107)
 - Fix salt generation for partial (patch) commits (#118)
+- Improve command hint to fix secret files not encrypted in index (#120)
 
 ## [2.1.0] - 2020-09-07
 

tests/test_pre_commit.bats

@@ -47,7 +47,7 @@ load "$BATS_TEST_DIRNAME/_test_helper.bash"
   [[ "${output}" = *"Transcrypt managed file is not encrypted in the Git index: sensitive_file"* ]]
   [[ "${output}" = *"You probably staged this file using a tool that does not apply .gitattribute filters as required by Transcrypt."* ]]
   [[ "${output}" = *"Fix this by re-staging the file with a compatible tool or with Git on the command line:"* ]]
-  [[ "${output}" = *"    git reset -- sensitive_file"* ]]
+  [[ "${output}" = *"    git rm --cached -- sensitive_file"* ]]
   [[ "${output}" = *"    git add sensitive_file"* ]]
 }
 

transcrypt

@@ -52,6 +52,7 @@ realpath() {
 }
 
 # establish repository metadata and directory handling
+# shellcheck disable=SC2155
 gather_repo_metadata() {
 	# whether or not transcrypt is already configured
 	readonly CONFIGURED=$(git config --get --local transcrypt.version 2>/dev/null)
@@ -429,7 +430,7 @@ save_helper_hooks() {
 		      printf 'Fix this by re-staging the file with a compatible tool or with'
 		      printf ' Git on the command line:\n' >&2
 		      printf '\n' >&2
-		      printf '    git reset -- %s\n' "$secret_file" >&2
+		      printf '    git rm --cached -- %s\n' "$secret_file" >&2
 		      printf '    git add %s\n' "$secret_file" >&2
 		      printf '\n' >&2
 		      exit 1