On Tue, Aug 22, 2017 at 6:03 PM, Jeffrey Walton <noloader@xxxxxxxxx> wrote: > On Tue, Aug 22, 2017 at 5:57 PM, Stefan Beller <sbeller@xxxxxxxxxx> wrote: >> On Tue, Aug 22, 2017 at 2:55 PM, Jeffrey Walton <noloader@xxxxxxxxx> wrote: >>> I tested some changes that lead to a dead end. The changes need to be >>> removed. The changes were added in 7 commits. >>> >>> I went back in time to the point before the changes: >>> >>> $ git reset --hard HEAD~7 >>> HEAD is now at 559fc3b Fix benchmark selection code (GH #464) >>> >>> When I attempted to push: >>> >>> $ git push >>> Username for 'https://github.com': noloader >>> To https://github.com/noloader/cryptopp.git >>> ! [rejected] master -> master (non-fast-forward) >>> >>> I tried to commit, but Git claims there's nothing to add: >>> >>> $ git commit >>> On branch master >>> Your branch is behind 'origin/master' by 7 commits, and can be >>> fast-forwarded. >>> >>> Commit seems to be the wrong command as Git appears to be trying to do >>> something I don't want. >>> >>> How do I force the push to succeed? >>> >>> Thanks in advance. >> >> Checkout the --force[-with-lease] argument. Thanks again Stefan, >From another testing machine, it looks like the changes have not been backed out. The previous operation un-did the ADX gear because it was an evolutionary dead-end. via$ git pull >From https://github.com/noloader/cryptopp + 66654dd...559fc3b master -> origin/master (forced update) Already up-to-date. via:$ cat integer.cpp | grep ADX #if defined(CRYPTOPP_ADX_AVAILABLE) # define CRYPTOPP_INTEGER_ADX 1 #if CRYPTOPP_INTEGER_SSE2 || CRYPTOPP_INTEGER_ADX #if CRYPTOPP_INTEGER_ADX extern int CRYPTOPP_FASTCALL ADX_Add(size_t N, word *C, const word *A, const word *B); #if CRYPTOPP_INTEGER_ADX if (HasADX()) s_pAdd = &ADX_Add; #if CRYPTOPP_INTEGER_SSE2 || CRYPTOPP_INTEGER_ADX Above, there should be no references to ADX. Looking at the GitHub the changes have been applied. Any ideas? Jeff
