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

Re: [PATCH 1/2] t3404: demonstrate CHERRY_PICK_HEAD bug

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jun 18, 2015, 16:16 UTC
Message-ID
<0f55232f453ab3a75bafe17db2744552@www.dscho.org>
In-Reply-To
<xmqqoakdf1lu.fsf@gitster.dls.corp.google.com>
Hi Junio,
On 2015-06-18 18:00, Junio C Hamano wrote:
Show 18 quoted lines
> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> 
>>>> +	git diff seq-onto &&
>>>
>>> I am puzzled with this "diff"; what is this about?  Is it a remnant
>>> from an earlier debugging session, or is it making sure seq-onto is
>>> a valid tree-ish?
>>
>> The idea is to verify that we end up with the same tree even if we
>> exchanged the latest two patches. I can remove it if you want as it is
>> not strictly necessary, but I would like to keep it just to make sure
>> that we did not end up with an incomplete rebase.
> 
> I agree that such a verification is a very good thing to have here.
> But you would need to ask "git diff" to signal that it found no
> differences with --exit-code or --quiet, I would think.
> 
> Thanks.
Whoops! Of course... You want me to re-roll?

Ciao, Dscho

Previous: Junio C HamanoNext: Johannes Schindelin
Message 8 of 20 in “rebase -i might leave CHERRY_PICK_HEAD behind”
  1. SZEDER GáborJun 16, 2015
  2. Johannes SchindelinJun 16, 2015
  3. 0/2 rebase -i: Fix left-behind CHERRY_PICK_HEADJohannes Schindelin, Jun 17, 2015
  4. 1/2 t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin, Jun 17, 2015
  5. Junio C HamanoJun 17, 2015
  6. Johannes SchindelinJun 18, 2015
  7. Junio C HamanoJun 18, 2015
  8. Johannes SchindelinJun 18, 2015
  9. 2/2 rebase -i: do not leave a CHERRY_PICK_HEAD file behindJohannes Schindelin, Jun 17, 2015
  10. SZEDER GáborJun 17, 2015
  11. Johannes SchindelinJun 17, 2015
  12. Junio C HamanoJun 17, 2015
  13. 0/2 rebase -i: Fix left-behind CHERRY_PICK_HEADJohannes Schindelin, Jun 18, 2015
  14. 1/2 t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin, Jun 18, 2015
  15. 2/2 rebase -i: do not leave a CHERRY_PICK_HEAD file behindJohannes Schindelin, Jun 18, 2015
  16. 0/2 rebase -i: Fix left-behind CHERRY_PICK_HEADJohannes Schindelin, Jun 18, 2015
  17. 1/2 t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin, Jun 18, 2015
  18. 2/2 rebase -i: do not leave a CHERRY_PICK_HEAD file behindJohannes Schindelin, Jun 18, 2015
  19. Junio C HamanoJun 18, 2015
  20. Johannes SchindelinJun 18, 2015

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.