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

Re: [PATCH v2 2/2] rebase: omit patch-identical commits with --fork-point

From
John Keeping <john@keeping.me.uk>
Date
Jul 17, 2014, 09:36 UTC
Message-ID
<20140717093622.GE2322@serenity.lan>
In-Reply-To
<53C6F043.7090209@tedfelix.com>
On Wed, Jul 16, 2014 at 05:36:03PM -0400, Ted Felix wrote:
Show 7 quoted lines
> On 07/16/2014 03:23 PM, John Keeping wrote:
> > Change from v1:
> >      - add a test case
> 
> Test case is working fine for me.  It passes with the patch and fails 
> without.  However, it does seem to cause all the rest of the test cases 
> to fail if it fails.  Is there some cleanup missing?

The individual test cases in the script don't run in isolation, so I don't think it's surprising the the remainder fail if this one ends up stuck in rebase-in-progress state. I think the same will happen with most of the other test cases in this script.

Previous: Ted Felix
Message 15 of 15 in “[BUG] rebase no longer omits local commits”
  1. Ted FelixJul 3, 2014
  2. John KeepingJul 3, 2014
  3. John KeepingJul 3, 2014
  4. Junio C HamanoJul 7, 2014
  5. John KeepingJul 7, 2014
  6. 1/2 rebase--am: use --cherry-pick instead of --ignore-if-in-upstreamJohn Keeping, Jul 15, 2014
  7. 2/2 rebase: omit patch-identical commits with --fork-pointJohn Keeping, Jul 15, 2014
  8. Ted FelixJul 15, 2014
  9. Junio C HamanoJul 15, 2014
  10. 1/2 rebase--am: use --cherry-pick instead of --ignore-if-in-upstreamJohn Keeping, Jul 16, 2014
  11. 2/2 rebase: omit patch-identical commits with --fork-pointJohn Keeping, Jul 16, 2014
  12. Junio C HamanoJul 16, 2014
  13. John KeepingJul 16, 2014
  14. Ted FelixJul 16, 2014
  15. John KeepingJul 17, 2014

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.