>>>> 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? You know, I look at how fucked up yet another simple workflow is, and all I can do is wonder. It is absolutely amazing. Its like the project goes out of its way to make simple tasks difficult.
