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

Re: git rebase bug?

From
Mike Hommey <mh@glandium.org>
Date
Jul 8, 2010, 09:47 UTC
Message-ID
<20100708094720.GB3720@glandium.org>
In-Reply-To
<m3bpajm0gw.fsf@localhost.localdomain>
On Wed, Jul 07, 2010 at 02:44:50PM -0700, Jakub Narebski wrote:
Show 25 quoted lines
> Mike Hommey <mh@glandium.org> writes:
> > On Wed, Jul 07, 2010 at 08:00:04PM +0200, Björn Steinbrink <B.Steinbrink@gmx.de> wrote:
> > > On 2010.07.07 17:05:45 +0200, Mike Hommey wrote:
> 
> > > > See how the security/manager/ssl/public/nsIBadCertListener.idl file that
> > > > was created by the original patch is created as
> > > > xulrunner/examples/simple/content/contents.rdf.
> > > 
> > > The "problem" is that nsIBadCertListener.idl wasn't actually created by
> > > the cherry-picked commit, but was modified. It was an empty file before,
> > > created in 4292283190983fa91b875e22664a79a3aa9ea45d.
> > > 
> > > And as nsIBadCertListener.idl is missing from the xulrunner/2.0 branch,
> > > git does the usual rename detection, finding another empty file and ends
> > > up patching that one instead.
> > 
> > Oh, makes sense. Thanks. So that's a quite troubling corner case...
> > I wonder if empty files shouldn't be special cased...
> 
> Well, similarity score (of contents and of filename) is weighted by
> contents length, but perhaps empty files / zero length somehow fall
> out as an edge case...
> 
> I agree that empty files should be special cased... unless filename is
> _very_ similar.
Question is, in a case like mine, what should the result be?
Mike
Previous: Jakub NarebskiNext: Jeff King
Message 5 of 6 in “git rebase bug?”
  1. Mike HommeyJul 7, 2010
  2. Björn SteinbrinkJul 7, 2010
  3. Mike HommeyJul 7, 2010
  4. Jakub NarebskiJul 7, 2010
  5. Mike HommeyJul 8, 2010
  6. Jeff KingJul 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.