sds / overcommit / 42765158542

100%

master: 91%

push

github

Keep deleted and renamed paths absent while stashing changes (#928)

Older Git versions can resurrect staged deletions and old rename paths as untracked files while commit hooks run. The scripted `git stash --keep-index` resets the working tree to HEAD, then restores the index without removing those paths, so tools such as RSpec can discover obsolete files.

Stash normally and restore the staged tree with `git read-tree --reset -u stash@{0}^2`. This updates the index and working tree without moving HEAD. If restoring the staged tree fails, stop before running hooks and retain the stash for recovery. Only restore it when this run actually created a stash.

Fixes the original normal-commit report in #699; the separate `overcommit --run` case was addressed in #905.

The added examples exposed a coverage-reporting problem: round-robin shard assignments shift when tests are added, so per-shard coverage comparisons can fail despite higher total coverage. CI now collects every shard's LCOV report and submits them together for one complete-suite coverage comparison. All test matrix jobs still run, and missing coverage artifacts fail the build.

Validation:

- Full suite: 1,750 examples, zero failures.
- All pre-commit checks and RuboCop pass.
- Added 12 examples covering pre-commit and commit-message contexts, current and emulated legacy stash behavior, complete state restoration, existing stashes, and setup failure recovery. No existing tests were removed.
- Confirmed setup and cleanup against Git 2.20's actual stash script, with its legacy text-output helper restored for compatibility with current Git.
- Confirmed the old-name regression tests fail before the fix.

Fixes #699.

5 of 5 new or added lines in 1 file covered. (100.0%)

3353 of 3624 relevant lines covered (92.52%)

1971.17 hits per line