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

Re: [PATCH] Pickaxe fixes.

From
Junio C Hamano <junkio@cox.net>
Date
May 28, 2005, 16:16 UTC
Message-ID
<7vpsvbuxzb.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20050528105914.GA8467@cip.informatik.uni-erlangen.de>
>>>>> "TG" == Thomas Glanzmann <sithglan@stud.uni-erlangen.de> writes:

TG> Btw. When doing the. 'git-whatchanged drivers/ide' thing TG> ... does that show only deltas which happened actually in TG> this tree or if a changeset contains deltas inside and TG> outside?

That's up to Linus right now. The behaviour is different before and after the 12-part patch I sent out yesterday [*1*].

My earlier thinking was to use the pathspec (e.g. drivers/ide) as the output filter, but Linus corrected me yesterday morning that he wants the pathspec as the input filter. What this means to your question is:

 - Under my earlier thinking, if drivers/ide/foo is a rename
   from drivers/usb/bar, diffcore gets both creation of foo and
   deletion of bar, diffcore-rename matches them up, and
   diffcore-pathspec filters the output to drivers/ide tree.
   Earlier pathspec picked up filepair that had the specified
   path on either src or dst side, so this would have been shown
   as a rename from usb/bar to ide/foo.
 - After the 12-part patch, the pathspec comes first and
   establishes a narrowed down world we operate in.  So in the
   same situation, diffcore is fed only creation of foo but does
   not see deletion of bar (which happened in drivers/usb, which
   is outside our world).  Hence diffcore-rename does not have
   anything to match up and this would be shown as a creation of
   ide/foo.

I agree with Linus that the latter is the semantics we usually want. If we make diffcore filters stackable (I mean, the order of applications controllable by the program and the user), we could also have the older semantics when the user wants it, but I would do that after this series stabilizes.

[Footnote]

*1* When I talk about time of the day, it is in US Pacific timezone.

Previous: Thomas GlanzmannNext: Thomas Glanzmann
Message 3 of 13 in “Add -O<orderfile> option to diff-* brothers.”
  1. Add -O<orderfile> option to diff-* brothers.Junio C Hamano, May 28, 2005
  2. Thomas GlanzmannMay 28, 2005
  3. Junio C HamanoMay 28, 2005
  4. Thomas GlanzmannMay 28, 2005
  5. Junio C HamanoMay 30, 2005
  6. Petr BaudisMay 28, 2005
  7. Thomas GlanzmannMay 28, 2005
  8. Junio C HamanoMay 28, 2005
  9. Junio C HamanoMay 28, 2005
  10. Fix leak in diffcore-order.cJunio C Hamano, May 28, 2005
  11. Linus TorvaldsMay 29, 2005
  12. Junio C HamanoMay 29, 2005
  13. Junio C HamanoMay 30, 2005

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.