On 09/21/2019 03:24 AM, David C. Rankin wrote: > I updated virtualbox-bin-5 and it builds and runs with 5.2.X & 5.3. However I > forgot to add a patch to the git repo before pushing and now I can't figure > out how to undo (I have since added the patch to git). The error is: > > git push > Enumerating objects: 10, done. > Counting objects: 100% (10/10), done. > Delta compression using up to 8 threads > Compressing objects: 100% (7/7), done. > Writing objects: 100% (7/7), 1.92 KiB | 1.92 MiB/s, done. > Total 7 (delta 4), reused 0 (delta 0) > remote: error: The following error occurred when parsing commit > remote: error: 3d54a4581d3c0731c53c5cc6b232c2d58864f6e1: > remote: error: missing source file: 015-linux-5-3.patch > remote: error: hook declined to update refs/heads/master > To ssh://aur.archlinux.org/virtualbox-bin-5 > ! [remote rejected] master -> master (hook declined) > error: failed to push some refs to 'ssh://aur@xxxxxxxxxxxxxxxxx/virtualbox-bin-5' > > What do I do to tell it to forget about that commit and let me try again? I got it sorted, I just reset to head and did the commit again after adding the new file. -- David C. Rankin, J.D.,P.E.
