Re: Updated ext4/jbd2 patches based on 2.6.19-rc1

Dave Kleikamp
2006-10-06T12:50:36Z

On Thu, 2006-10-05 at 16:25 -0700, Linus Torvalds wrote:
>
> On Thu, 5 Oct 2006, Andrew Morton wrote:
> >
> > Linus, what's the best way of doing this? Will git dtrt with a patch which
> > copies files, or would a script which does the mkdir's and cp's be better?
>
> Git should dtrt.
>
> In fact, if you use
>
> git diff -C
>
> it should generate the appropriate "file copied" things automatically, and
> you don't need any huge file at all, you'll get a "patch" that looks
> something like
>
> diff --git a/fs/ext3/inode.c b/fs/ext4/inode.c
> similarity index 100%
> copy from fs/ext3/inode.c
> copy to fs/ext4/inode.c
> diff --git a/fs/ext3/super.c b/fs/ext4/super.c
> similarity index 98%
> copy from fs/ext3/super.c
> copy to fs/ext4/super.c
> index xyz..zzy 100644
> --- a/fs/ext3/super.c
> +++ b/fs/ext4/super.c
> .. small diff that changes "ext3" to "ext4" goes here ..
>
>
> ie you'll effectively get the best of both worlds: a "diff", but one that
> is actually readable and shows what is going on.

We haven't been using git to manage ext4 so far, although in hindsight
it probably would have made things easier. I'm assuming that you're
just suggesting this for educational purposes and that git will handle
the patches that Andrew picked up into -mm just fine.

I could re-generate the patches that do the copies from git, but I don't
believe it will be that beneficial at this point.

> I hate to beat my own drum (not really), but git really _is_ a lot better
> than anything else out there ;)

No argument here :-)

Shaggy
--
David Kleikamp
IBM Linux Technology Center