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

Re: [PATCH 1/2] t7001: add test for git-mv dir1 dir2/

From
Junio C Hamano <junkio@cox.net>
Date
Jul 28, 2006, 04:48 UTC
Message-ID
<7vr706mj0u.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20060728025619.GK13776@pasky.or.cz>
Petr Baudis <pasky@suse.cz> writes:
Show 14 quoted lines
> Dear diary, on Fri, Jul 28, 2006 at 04:41:04AM CEST, I got a letter
> where Junio C Hamano <junkio@cox.net> said that...
>> Petr Baudis <pasky@suse.cz> writes:
>> >   (iv) I need git-apply to add/remove to/from index new/gone files,
>> > while at the same time...
>> >
>> >   (v) I want to allow applying of patches to working copy that is not
>> > completely clean, even on top of modified files
>> 
>> You probably should be able to talk me into doing these, but
>> doesn't it already do (iv) and (v)?
>
> Well, at once? I can do (iv) by adding --index but that contradicts (v).
> But maybe I'm missing something.

What should the semantics of such operation be? Apply to index on paths that are clean while leave the index entries untouched for paths that are dirty? What should happen on renamed paths that are dirty?

Previous: Petr BaudisNext: Petr Baudis
Message 14 of 22 in “t7001: add test for git-mv dir1 dir2/”
  1. 1/2 t7001: add test for git-mv dir1 dir2/Johannes Schindelin, Jul 26, 2006
  2. Jon SmirlJul 26, 2006
  3. Junio C HamanoJul 26, 2006
  4. Jon SmirlJul 26, 2006
  5. Junio C HamanoJul 26, 2006
  6. Junio C HamanoJul 26, 2006
  7. Jon SmirlJul 26, 2006
  8. Johannes SchindelinJul 26, 2006
  9. Josef WeidendorferJul 26, 2006
  10. Junio C HamanoJul 26, 2006
  11. Petr BaudisJul 28, 2006
  12. Junio C HamanoJul 28, 2006
  13. Petr BaudisJul 28, 2006
  14. Junio C HamanoJul 28, 2006
  15. Petr BaudisJul 28, 2006
  16. Teach git-apply about '-R'Johannes Schindelin, Jul 28, 2006
  17. Linus TorvaldsJul 28, 2006
  18. Teach git-apply about '-R'Johannes Schindelin, Jul 28, 2006
  19. Junio C HamanoJul 28, 2006
  20. Johannes SchindelinJul 28, 2006
  21. Junio C HamanoJul 28, 2006
  22. Johannes SchindelinJul 28, 2006

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.