chore: update git index refresh

Signed-off-by: Christopher Phillips <[email protected]>
anchore · Jan 31, 2023 · d389bc4 · d389bc4
1 parent 9a1996d
commit d389bc4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/scripts/go-mod-tidy-check.sh b/.github/scripts/go-mod-tidy-check.sh
@@ -4,7 +4,11 @@ set -eu
 ORIGINAL_STATE_DIR=$(mktemp -d "TEMP-original-state-XXXXXXXXX")
 TIDY_STATE_DIR=$(mktemp -d "TEMP-tidy-state-XXXXXXXXX")
 
+<<<<<<< Updated upstream
 trap "cp ${ORIGINAL_STATE_DIR}/* ./ && rm -fR ${ORIGINAL_STATE_DIR} ${TIDY_STATE_DIR}" EXIT
+=======
+trap "cp -p ${ORIGINAL_STATE_DIR}/* ./ && git update-index -q --refresh && rm -fR ${ORIGINAL_STATE_DIR} ${TIDY_STATE_DIR}" EXIT
+>>>>>>> Stashed changes
 
 # capturing original state of files...
 cp go.mod go.sum "${ORIGINAL_STATE_DIR}"