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

Re: I'm missing isofs.h

From
Junio C Hamano <junkio@cox.net>
Date
Apr 28, 2005, 05:27 UTC
Message-ID
<7vhdhra2sg.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20050428003246.GV22956@pasky.ji.cz>
>>>>> "PB" == Petr Baudis <pasky@ucw.cz> writes:

PB> Actually, I can't; the patch generator is not on par with mine yet. PB> It does not show modes and does not indicate file adds/removals by PB> /dev/null - basically, I need something cg-patch can eat (and it should PB> be backwards compatible). I think throwing the sha1 hashes away will not PB> harm; I got used to the Index: field and === marker, but I don't care if PB> I loose it.

I've looked at what cg-Xdiffdo does. From the above paragraph, I sense that it does more than what cg-patch requires, so I took a look at cg-patch, too.

Can you help me verify if I understand the requirements cg-patch has on its input correctly?

 - Follow the convention of showing newly added files with
   "--- /dev/null" and removed files with "+++ /dev/null";
 - Label matches this Perl regexp:
     m|^(---|\+\+\+)\s+[^/]+\/(\S+)\s+.*mode:([0-7]{3,}).*/|
   and you only care about sign ($1), filename ($2) and mode ($3).
To illustrate, cg-Xdiffdo generates something like:
 (modified files)
 --- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF/fs/ext3/Makefile  (mode:0644)
 +++ EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE/fs/ext3/Makefile  (mode:0664)
 (deleted files)
 --- FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF/fs/ext3/Makefile  (mode:0644)
 +++ /dev/null  (tree:EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE)
 (added files)
 --- /dev/null  (tree:EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE)
 +++ FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF/fs/ext3/Makefile  (mode:0644)
but they could be like the following to satisfy cg-patch:
 (modified files)
 --- a/fs/ext3/Makefile  (mode:0644)
 +++ b/fs/ext3/Makefile  (mode:0664)
 (deleted files)
 --- a/fs/ext3/Makefile  (mode:0644)
 +++ /dev/null
 (added files)
 --- /dev/null
 +++ b/fs/ext3/Makefile  (mode:0644)

Is my understanding correct? If so it should not be too much work to generate something like it from within the builtin stuff.

Provided if that is what the kernel folks can live with (I do see why the tool wants the mode bits, but it is unusual to see non-timestamp strings after filenames).

Linus & Andrew, is the above (second) format acceptable for the kernel work?

Previous: Junio C HamanoNext: Junio C Hamano
Message 12 of 23 in “I'm missing isofs.h”
  1. Andrew MortonApr 27, 2005
  2. Jan HarkesApr 27, 2005
  3. Petr BaudisApr 27, 2005
  4. Jan HarkesApr 27, 2005
  5. Jan HarkesApr 27, 2005
  6. Steven ColeApr 27, 2005
  7. Steven ColeApr 27, 2005
  8. Petr BaudisApr 27, 2005
  9. Linus TorvaldsApr 28, 2005
  10. Petr BaudisApr 28, 2005
  11. Junio C HamanoApr 28, 2005
  12. Junio C HamanoApr 28, 2005
  13. Make diff-cache and friends output more cg-patch friendly.Junio C Hamano, Apr 28, 2005
  14. Petr BaudisApr 28, 2005
  15. David A. WheelerApr 28, 2005
  16. Linus TorvaldsApr 28, 2005
  17. Junio C HamanoApr 28, 2005
  18. Linus TorvaldsApr 28, 2005
  19. Cogito nit: cg-update should default to "origin".David A. Wheeler, Apr 28, 2005
  20. Petr BaudisApr 28, 2005
  21. Dan HolmsandApr 28, 2005
  22. David A. WheelerApr 28, 2005
  23. Dan HolmsandApr 28, 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.