#1066048 reportbug: git rm after merge lists removed file twice

Package:
git
Source:
git
Description:
fast, scalable, distributed revision control system
Submitter:
наб
Date:
2024-03-11 17:42:04 UTC
Severity:
normal
#1066048#5
Date:
2024-03-11 17:38:42 UTC
From:
To:
Dear Maintainer,

$ git clone https://git.sr.ht/~nabijaczleweli/fzifdso
$ cd fzifdso
$ git reset --hard d2a872f
$ git fetch https://git.sr.ht/~nabijaczleweli/tzpfms 48bebe9be385f569ddc388d3560914f51fa8a0a0
$ git merge 48bebe9be385f569ddc388d3560914f51fa8a0a0
$ git rm -rf contrib/
rm 'contrib/zfs-tpm1x-muddle-pcrs.cpp'
rm 'contrib/zfs-tpm1x-muddle-pcrs.cpp'

Naturally, this file exists once,
so I don't really see what removing it twice could mean.

Attaching archive, ready for git merge and git rm.

Best,
наб