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

Re: git apply vs. renamed files index mismatch

From
GUGeert Uytterhoeven <geert.uytterhoeven@sonycom.com>
Date
Sep 9, 2008, 09:06 UTC
Message-ID
<Pine.LNX.4.64.0809091105010.27142@vixen.sonytel.be>
In-Reply-To
<20080908215441.GA924@oksana.dev.rtsoft.ru>
On Tue, 9 Sep 2008, Anton Vorontsov wrote:
Show 29 quoted lines
> On Mon, Sep 08, 2008 at 04:38:57PM -0500, Scott Wood wrote:
> > Anton Vorontsov wrote:
> >> I always thought that posting "-M" patches to the public lists is
> >> discouraged since it is quite difficult to apply them via patch(1).
> >> Also think of non-git users...
> >
> > I think the substantially enhanced reviewability trumps non-git-users  
> > who can follow the rename instructions manually (or fix up their patch  
> > utility) if they insist on shunning tools that would make their life 
> > easier.
> 
> Can't disagree, I myself use git. ;-) But I'm also using standard
> patch(1) to test occasional patches... And sometimes linux-X tree
> isn't tracked by git (e.g. -mm otm snapshots).
> 
> >> diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
> >> new file mode 100644
> >> index 0000000..ae5708e
> >> [...]
> >> diff --git a/arch/powerpc/kernel/dma_64.c b/arch/powerpc/kernel/dma_64.c
> >> deleted file mode 100644
> >> index ae5708e..0000000
> >>
> >> That is, if hashes match then it was pure rename.
> >
> > I suppose, though it's not as easy to spot, and won't help in showing  
> > what the differences are if there are any.
> 
> ..rename and changes ideally go in separate patches.

Except if the rename also requires some small changes (cfr. the move of include/asm-*). But if no changes are required to fix breakage caused by the rename, then make the changes separate.

> IIRC this also helps git to track renames (it can easily compare
> hashes instead of guessing).
With kind regards,

Geert Uytterhoeven Software Architect

Sony Techsoft Centre Europe The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium

Phone:    +32 (0)2 700 8453
Fax:      +32 (0)2 700 8622
E-mail:   Geert.Uytterhoeven@sonycom.com
Internet: http://www.sony-europe.com/

A division of Sony Europe (Belgium) N.V. VAT BE 0413.825.160 · RPR Brussels Fortis · BIC GEBABEBB · IBAN BE41293037680010

Previous: Junio C HamanoNext: Christoph Hellwig
Message 5 of 11 in “git apply vs. renamed files index mismatch (was: Re: [PATCH 1/4] POWERPC: Rename dma_64.c to dma.c)”
  1. Anton VorontsovSep 8, 2008
  2. Scott WoodSep 8, 2008
  3. Anton VorontsovSep 8, 2008
  4. Junio C HamanoSep 9, 2008
  5. Geert UytterhoevenSep 9, 2008
  6. Christoph HellwigSep 8, 2008
  7. Junio C HamanoSep 9, 2008
  8. Anton VorontsovSep 9, 2008
  9. Junio C HamanoSep 9, 2008
  10. Anton VorontsovSep 9, 2008
  11. Junio C HamanoSep 10, 2008

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.