$ git pull
remote: Counting objects: 409, done.
remote: Compressing objects: 100% (66/66), done.
remote: Total 409 (delta 269), reused 248 (delta 247), pack-reused 96
Receiving objects: 100% (409/409), 82.91 KiB | 0 bytes/s, done.
Resolving deltas: 100% (273/273), completed with 61 local objects.
From github.com:alphagov/smart-answers
c71d9c3..6f9dbfe master -> origin/master
9f9ef5d..741945f benefit-cap-calculator-pre-autumn-changes -> origin/benefit-cap-calculator-pre-autumn-changes
* [new branch] benefit-cap-calculator-two-flows -> origin/benefit-cap-calculator-two-flows
22a1b66..6f9dbfe deployed-to-integration -> origin/deployed-to-integration
* [new branch] fixing-link-to-wrong-form -> origin/fixing-link-to-wrong-form
* [new branch] letter-of-no-trace -> origin/letter-of-no-trace
+ 973577d...b57bd7f marriage-abroad-romania -> origin/marriage-abroad-romania (forced update)
+ 4459078...f38bff2 overseas-passports-uk-bug -> origin/overseas-passports-uk-bug (forced update)
22a1b66..6f9dbfe release -> origin/release
* [new tag] release_3230 -> release_3230
* [new tag] release_3232 -> release_3232
* [new tag] release_3233 -> release_3233
* [new tag] release_3231 -> release_3231
Auto packing the repository in background for optimum performance.
See "git help gc" for manual housekeeping.
error: The last gc run reported the following. Please correct the root cause
and remove .git/gc.log.
Automatic cleanup will not be performed until the file is removed.
warning: reflog of 'HEAD' references pruned commits
warning: reflog of 'HEAD' references pruned commits
Updating c71d9c3..6f9dbfe
Fast-forward
Auto packing the repository in background for optimum performance.
See "git help gc" for manual housekeeping.
error: The last gc run reported the following. Please correct the root cause
and remove .git/gc.log.
Automatic cleanup will not be performed until the file is removed.
warning: reflog of 'HEAD' references pruned commits
warning: reflog of 'HEAD' references pruned commits
lib/smart_answer/calculators/overseas_passports_calculator.rb | 2 +-
lib/smart_answer/calculators/state_pension_age_calculator.rb | 10 ++++++++++
lib/smart_answer_flows/state-pension-age/outcomes/not_yet_reached_sp_age.govspeak.erb | 6 ++++++
test/artefacts/state-pension-age/age/1950-02-01/male.txt | 4 ++++
test/data/overseas-passports-files.yml | 2 +-
test/data/state-pension-age-files.yml | 2 +-
test/unit/calculators/overseas_passports_calculator_test.rb | 6 ++++++
test/unit/calculators/state_pension_age_calculator_test.rb | 40 ++++++++++++++++++++++++++++++++++++++++
8 files changed, 69 insertions(+), 3 deletions(-)The following command apparently fixes the problem (according to https://feeding.cloud.geek.nz/posts/error-while-running-git-gc/).
$ git reflog expire --all --stale-fix
$ rm .git/gc.log