Unlocking with new key

[nirvdrum]

I've set up a new GPG key to be accessed on a Yubikey. My old key is still valid, but will expire in a year. I'd like to migrate all of my GPG usage to the new key. I added it to a repo with git crypt add-gpg-user --trust <key> and git-crypt set up its state. However, when I unlock, I'm prompted for the password for the old key and if I don't enter it the agent doesn't move on to the next key.

I've found if I delete the old .gpg file that's stored in the .git-crypt.d/ directory that the agent will prompt for the PIN on my Yubikey. I can go through and manually delete these files. It's not a big problem. But, is there any way to allow access with both keys? I'm worried I have a fundamental disconnect on how this is supposed to work.

[nirvdrum]

My solution was to delete one of the private keys. I was hoping this would work as an ANY operation, not an ALL. I think git-crypt could catch the exception and move on to the next key, but maybe my use case is niche. Basically, I wanted to migrate to a new key but still have only the old key on some systems. So, removing the old key from the repo would create problems on clients that don't have the new key yet.