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

Re: [PATCH] add test case for rebase of empty commit

From
Neil Horman <nhorman@tuxdriver.com>
Date
Jul 3, 2012, 20:31 UTC
Message-ID
<20120703203136.GC10864@hmsreliant.think-freely.org>
In-Reply-To
<7vtxxovfec.fsf@alter.siamese.dyndns.org>
On Tue, Jul 03, 2012 at 12:00:27PM -0700, Junio C Hamano wrote:
Show 18 quoted lines
> Neil Horman <nhorman@tuxdriver.com> writes:
> 
> > So, I've been thinking about this some, and I'm a bit stuck on it.  Reading the
> > test description for t3401, I see that we're testing gits ability to detect
> > patches merged upstream when doing a rebase.  That said, how are we supposed to
> > differentiate between upstream empty patches that have been cherry-picked or
> > merged, and local branch empty changes that haven't.  As humans we can see that
> > the changelog might be the same, but git has no way to detect that, and if
> > --allow-empty is specified will just apply any empty patch it finds between the
> > two branches merge base and the topic branch head.  Does anyone have an idea as
> > to how we should detect such duplication?
> 
> The changelog might be similar or textually identical, but it is
> entirely a different matter if it makes sense taken out of the
> context (i.e. cherry-picked).  So I would personally do not bother
> "filtering" about them too much---if you ask for empties, you will
> get all empties.
> 

Ok, copy that. Thanks! Neil

Previous: Junio C HamanoNext: Junio C Hamano
Message 6 of 8 in “add test case for rebase of empty commit”
  1. add test case for rebase of empty commitMartin von Zweigbergk, Jun 27, 2012
  2. Junio C HamanoJun 27, 2012
  3. Neil HormanJun 28, 2012
  4. Neil HormanJul 3, 2012
  5. Junio C HamanoJul 3, 2012
  6. Neil HormanJul 3, 2012
  7. Junio C HamanoJul 3, 2012
  8. Neil HormanJul 3, 2012

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.