From 6a13baf7d41e28a6e558e0deaecff5febd26e890 Mon Sep 17 00:00:00 2001 From: Richard Hansen Date: Sat, 9 Jan 2021 17:27:51 -0500 Subject: [PATCH] checkPlugin: Use `--name-status` for `git diff-index` `--compact-sumary` is relatively new (v2.17.0), and I actually intended to use `--name-status` anyway. --- bin/plugins/checkPlugin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/plugins/checkPlugin.js b/bin/plugins/checkPlugin.js index 44a26c45c..d71bb49e4 100755 --- a/bin/plugins/checkPlugin.js +++ b/bin/plugins/checkPlugin.js @@ -53,7 +53,7 @@ const prepareRepo = () => { execSync('git rev-parse --verify @{u}'); // Make sure there's a remote tracking branch. const dirtyFiles = execSync('git ls-files -dmo --exclude-standard'); if (dirtyFiles !== '') throw new Error(`working directory is unclean:\n${dirtyFiles}`); - const indexStatus = execSync('git diff-index --cached --compact-summary HEAD'); + const indexStatus = execSync('git diff-index --cached --name-status HEAD'); if (indexStatus !== '') throw new Error(`uncommitted staged changes to files:\n${indexStatus}`); execSync('git pull --ff-only', {stdio: 'inherit'}); if (execSync('git rev-list @{u}...') !== '') throw new Error('repo contains unpushed commits');