git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: How to force a push to succeed?

From
JWJeffrey Walton <noloader@gmail.com>
Date
Aug 22, 2017, 22:26 UTC
Message-ID
<CAH8yC8=HuAZ0tJbRGnp83-Th5OkQ0-cdSOBrMU23y6NyB0Ax3g@mail.gmail.com>
In-Reply-To
<CAH8yC8nHnbWTG4hxD+mEHKPS6eWcBb7yMsgN886=aTWaBRhE5A@mail.gmail.com>
Show 35 quoted lines
>>>> 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.

Previous: Jeffrey WaltonNext: Johannes Sixt
Message 5 of 8 in “How to force a push to succeed?”
  1. Jeffrey WaltonAug 22, 2017
  2. Stefan BellerAug 22, 2017
  3. Jeffrey WaltonAug 22, 2017
  4. Jeffrey WaltonAug 22, 2017
  5. Jeffrey WaltonAug 22, 2017
  6. Johannes SixtAug 23, 2017
  7. Jonathan NiederAug 23, 2017
  8. Kevin DaudtAug 23, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.