If you fixup a commit that is not HEAD, the commits look like:
Here fixup A contains .gitattributes change with git-zcrypt encryption settings, and actually compressing files using git rm --cached target_files && git add target_files.
If you git rebase base -i --autosquash, rebasing fails with:
$ git rebase -i 7a7c1e55604d4517de6c0fe7ed4780871731dfec --autosquash
error: no git-zcrypt-keys.json found for work/test/file.txt; run git-zcrypt init-manifest
error: external filter 'git-zcrypt smudge --path %f' failed 1
error: external filter 'git-zcrypt smudge --path %f' failed
fatal: work/test/file.txt: smudge filter git-zcrypt failed
Working around is not complex: just place failed files yourself and add. You'll be guided to git commit --amend because git rebase failed while attempting to apply fixup A.
Unknowns
If you fixup a commit that is not HEAD, the commits look like:
Here
fixup Acontains .gitattributes change with git-zcrypt encryption settings, and actually compressing files usinggit rm --cached target_files && git add target_files.If you
git rebase base -i --autosquash, rebasing fails with:Working around is not complex: just place failed files yourself and add. You'll be guided to
git commit --amendbecausegit rebasefailed while attempting to applyfixup A.Unknowns