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

Re: [PATCHv2 1/2] t5520-pull: Add testcases showing spurious conflicts from git pull --rebase

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Aug 8, 2010, 21:43 UTC
Message-ID
<20100808214358.GB6962@burratino>
In-Reply-To
<201008082336.18270.j6t@kdbg.org>
Johannes Sixt wrote:
> On Sonntag, 8. August 2010, Elijah Newren wrote:
Show 9 quoted lines
>> +test_expect_success 'setup for avoiding reapplying old patches' '
>> +	(cd dst &&
>> +	 (git rebase --abort || true) &&
>
> Perhaps:
>
> 	test_might_fail git rebase --abort &&
>
> but I'm not sure whether that's the intended use of test_might_fail.
It is.  Thanks for noticing.
Previous: Johannes SixtNext: Elijah Newren
Message 7 of 8 in “[PATCHv2 0/2] Fix spurious conflicts with pull --rebase”
  1. Elijah NewrenAug 8, 2010
  2. 1/2 t5520-pull: Add testcases showing spurious conflicts from git pull --rebaseElijah Newren, Aug 8, 2010
  3. Ævar Arnfjörð BjarmasonAug 8, 2010
  4. Elijah NewrenAug 8, 2010
  5. Ævar Arnfjörð BjarmasonAug 8, 2010
  6. Johannes SixtAug 8, 2010
  7. Jonathan NiederAug 8, 2010
  8. 2/2 pull --rebase: Avoid spurious conflicts and reapplying unnecessary patchesElijah Newren, Aug 8, 2010

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.