svenvanheugten/git-check-assertions
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'Restore the worktree after a failure' (#8) from restore-worktree-after-failure into main

Browse source 
Reviewed-on: https://codeberg.org/svenvanheugten/git-check-assertions/pulls/8
This commit is contained in:
Sven van Heugten 2026-03-04 07:46:58 +01:00
commit cb74f351f7
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
bin/git-check-assertions
View file

@ -84,6 +84,7 @@ for commit_hash in "${commits[@]}"; do
printf '%s\n' "$block" | sed 's/^/> /' printf '%s\n' "$block" | sed 's/^/> /'
if ! bash -euo pipefail -c "$block"; then if ! bash -euo pipefail -c "$block"; then
echo "git-check-assertions block failed in $commit_hash" >&2 echo "git-check-assertions block failed in $commit_hash" >&2
git restore -q .
echo "Returning to $orig_ref" echo "Returning to $orig_ref"
git checkout -q "$orig_ref" git checkout -q "$orig_ref"
exit 1 exit 1

10
test/git-check-assertions.bats
View file

@ -99,6 +99,16 @@ commit_with_assertion() {
assert_size_zero ../test assert_size_zero ../test
} }
@test "should restore worktree after a failure" {
git checkout -b feature
commit_with_assertion $'echo blah >> readme\nexit 3'
run git-check-assertions
assert_failure
assert_size_zero readme
}
@test "assertions should run against the version of the code inside of the commit" { @test "assertions should run against the version of the code inside of the commit" {
git checkout -b feature git checkout -b feature
echo commit1 >readme echo commit1 >readme