From: Junio C Hamano <junkio@cox.net>
To: Petr Baudis <pasky@ucw.cz>
Cc: Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>,
git@vger.kernel.org
Subject: Re: I'm missing isofs.h
Date: Wed, 27 Apr 2005 22:27:59 -0700 [thread overview]
Message-ID: <7vhdhra2sg.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20050428003246.GV22956@pasky.ji.cz> (Petr Baudis's message of "Thu, 28 Apr 2005 02:32:47 +0200")
>>>>> "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?
next prev parent reply other threads:[~2005-04-28 5:22 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-27 4:43 I'm missing isofs.h Andrew Morton
2005-04-27 12:58 ` Jan Harkes
2005-04-27 13:58 ` Petr Baudis
2005-04-27 16:43 ` Jan Harkes
2005-04-27 16:45 ` Jan Harkes
2005-04-27 15:31 ` Steven Cole
2005-04-27 17:40 ` Steven Cole
2005-04-27 23:51 ` Petr Baudis
2005-04-28 0:19 ` Linus Torvalds
2005-04-28 0:32 ` Petr Baudis
2005-04-28 2:02 ` Junio C Hamano
2005-04-28 5:27 ` Junio C Hamano [this message]
2005-04-28 6:28 ` [PATCH] Make diff-cache and friends output more cg-patch friendly Junio C Hamano
2005-04-28 7:52 ` I'm missing isofs.h Petr Baudis
2005-04-28 23:39 ` David A. Wheeler
2005-04-28 14:42 ` Linus Torvalds
2005-04-28 16:11 ` Junio C Hamano
2005-04-28 16:28 ` Linus Torvalds
2005-04-28 0:32 ` Cogito nit: cg-update should default to "origin" David A. Wheeler
2005-04-28 0:53 ` Petr Baudis
2005-04-28 1:52 ` Dan Holmsand
2005-04-28 3:57 ` David A. Wheeler
2005-04-28 8:22 ` Dan Holmsand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vhdhra2sg.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=akpm@osdl.org \
--cc=git@vger.kernel.org \
--cc=pasky@ucw.cz \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.