Add *.bz2 and *.cpio to the top-level gitignore file, for consistency
with *.gz and *.lzma which are already there. Remove specific rules
in usr/gitignore, since they are now covered by the global rules.
Signed-off-by: H. Peter Anvin <[email protected]>
Cc: Sam Ravnborg <[email protected]>
---
.gitignore | 2 ++
usr/.gitignore | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index cecb3b0..a909275 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,8 @@
*.order
*.elf
*.bin
+*.cpio
+*.bz2
*.gz
*.lzma
*.patch
diff --git a/usr/.gitignore b/usr/.gitignore
index 69b2e89..4d7d9f4 100644
--- a/usr/.gitignore
+++ b/usr/.gitignore
@@ -2,7 +2,5 @@
# Generated files
#
gen_init_cpio
-initramfs_data.cpio
-initramfs_data.cpio.gz
initramfs_list
include
--
1.6.0.6
On Sat, 2009-06-20 at 13:52 -0700, H. Peter Anvin wrote:
> Add *.bz2 and *.cpio to the top-level gitignore file, for consistency
> with *.gz and *.lzma which are already there. Remove specific rules
> in usr/gitignore, since they are now covered by the global rules.
>
> Signed-off-by: H. Peter Anvin <[email protected]>
> Cc: Sam Ravnborg <[email protected]>
It seems this is based on my patch :
[PATCH] gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma
And you forget to CC me ;-)
Are you trying to do this, fill signed-off-by and enjoy :
[PATCH] Add *.bz2 and *.cpio to the top-level gitignore file, for consistency
with *.gz and *.lzma which are already there. Remove specific rules
in other gitignores, since they are now covered by the global rules.
---
.gitignore | 2 ++
Documentation/DocBook/.gitignore | 1 -
arch/arm/boot/compressed/.gitignore | 1 -
arch/powerpc/boot/.gitignore | 1 -
kernel/.gitignore | 1 -
usr/.gitignore | 2 --
6 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index cecb3b0..a255340 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,8 @@
*.elf
*.bin
*.gz
+*.bz2
+*.cpio
*.lzma
*.patch
diff --git a/Documentation/DocBook/.gitignore b/Documentation/DocBook/.gitignore
index c6def35..0c91638 100644
--- a/Documentation/DocBook/.gitignore
+++ b/Documentation/DocBook/.gitignore
@@ -2,7 +2,6 @@
*.ps
*.pdf
*.html
-*.9.gz
*.9
*.aux
*.dvi
diff --git a/arch/arm/boot/compressed/.gitignore b/arch/arm/boot/compressed/.gitignore
index ab204db..269b788 100644
--- a/arch/arm/boot/compressed/.gitignore
+++ b/arch/arm/boot/compressed/.gitignore
@@ -1,3 +1,2 @@
font.c
-piggy.gz
vmlinux.lds
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
index 2f50acd..af4105b 100644
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
@@ -16,7 +16,6 @@ inftrees.h
infutil.c
infutil.h
kernel-vmlinux.strip.c
-kernel-vmlinux.strip.gz
mktree
uImage
cuImage.*
diff --git a/kernel/.gitignore b/kernel/.gitignore
index ab4f109..04f6d83 100644
--- a/kernel/.gitignore
+++ b/kernel/.gitignore
@@ -2,5 +2,4 @@
# Generated files
#
config_data.h
-config_data.gz
timeconst.h
diff --git a/usr/.gitignore b/usr/.gitignore
index 69b2e89..4d7d9f4 100644
--- a/usr/.gitignore
+++ b/usr/.gitignore
@@ -2,7 +2,5 @@
# Generated files
#
gen_init_cpio
-initramfs_data.cpio
-initramfs_data.cpio.gz
initramfs_list
include
--
1.6.0.6
On Sun, Jun 21, 2009 at 01:02:27PM +0530, Jaswinder Singh Rajput wrote:
>
> On Sat, 2009-06-20 at 13:52 -0700, H. Peter Anvin wrote:
> > Add *.bz2 and *.cpio to the top-level gitignore file, for consistency
> > with *.gz and *.lzma which are already there. Remove specific rules
> > in usr/gitignore, since they are now covered by the global rules.
> >
> > Signed-off-by: H. Peter Anvin <[email protected]>
> > Cc: Sam Ravnborg <[email protected]>
>
> It seems this is based on my patch :
>
> [PATCH] gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma
>
> And you forget to CC me ;-)
>
> Are you trying to do this, fill signed-off-by and enjoy :
>
> [PATCH] Add *.bz2 and *.cpio to the top-level gitignore file, for consistency
> with *.gz and *.lzma which are already there. Remove specific rules
> in other gitignores, since they are now covered by the global rules.
I would prefer to have *.gz and *.lzma pushed out to the
directories where it matters.
There global ignore rules will bite us one day.
So I did not apply neither this nor Peter's original patch.
Sam
Hello Sam, Peter,
On Sun, 2009-06-21 at 13:02 +0530, Jaswinder Singh Rajput wrote:
> On Sat, 2009-06-20 at 13:52 -0700, H. Peter Anvin wrote:
> > Add *.bz2 and *.cpio to the top-level gitignore file, for consistency
> > with *.gz and *.lzma which are already there. Remove specific rules
> > in usr/gitignore, since they are now covered by the global rules.
> >
> > Signed-off-by: H. Peter Anvin <[email protected]>
> > Cc: Sam Ravnborg <[email protected]>
>
> It seems this is based on my patch :
>
> [PATCH] gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma
>
> And you forget to CC me ;-)
>
> Are you trying to do this, fill signed-off-by and enjoy :
>
> [PATCH] Add *.bz2 and *.cpio to the top-level gitignore file, for consistency
> with *.gz and *.lzma which are already there. Remove specific rules
> in other gitignores, since they are now covered by the global rules.
>
> ---
> .gitignore | 2 ++
> Documentation/DocBook/.gitignore | 1 -
> arch/arm/boot/compressed/.gitignore | 1 -
> arch/powerpc/boot/.gitignore | 1 -
> kernel/.gitignore | 1 -
> usr/.gitignore | 2 --
> 6 files changed, 2 insertions(+), 6 deletions(-)
>
What is your views about this patch.
Thanks,
--
JSR
> diff --git a/.gitignore b/.gitignore
> index cecb3b0..a255340 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -25,6 +25,8 @@
> *.elf
> *.bin
> *.gz
> +*.bz2
> +*.cpio
> *.lzma
> *.patch
>
> diff --git a/Documentation/DocBook/.gitignore b/Documentation/DocBook/.gitignore
> index c6def35..0c91638 100644
> --- a/Documentation/DocBook/.gitignore
> +++ b/Documentation/DocBook/.gitignore
> @@ -2,7 +2,6 @@
> *.ps
> *.pdf
> *.html
> -*.9.gz
> *.9
> *.aux
> *.dvi
> diff --git a/arch/arm/boot/compressed/.gitignore b/arch/arm/boot/compressed/.gitignore
> index ab204db..269b788 100644
> --- a/arch/arm/boot/compressed/.gitignore
> +++ b/arch/arm/boot/compressed/.gitignore
> @@ -1,3 +1,2 @@
> font.c
> -piggy.gz
> vmlinux.lds
> diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
> index 2f50acd..af4105b 100644
> --- a/arch/powerpc/boot/.gitignore
> +++ b/arch/powerpc/boot/.gitignore
> @@ -16,7 +16,6 @@ inftrees.h
> infutil.c
> infutil.h
> kernel-vmlinux.strip.c
> -kernel-vmlinux.strip.gz
> mktree
> uImage
> cuImage.*
> diff --git a/kernel/.gitignore b/kernel/.gitignore
> index ab4f109..04f6d83 100644
> --- a/kernel/.gitignore
> +++ b/kernel/.gitignore
> @@ -2,5 +2,4 @@
> # Generated files
> #
> config_data.h
> -config_data.gz
> timeconst.h
> diff --git a/usr/.gitignore b/usr/.gitignore
> index 69b2e89..4d7d9f4 100644
> --- a/usr/.gitignore
> +++ b/usr/.gitignore
> @@ -2,7 +2,5 @@
> # Generated files
> #
> gen_init_cpio
> -initramfs_data.cpio
> -initramfs_data.cpio.gz
> initramfs_list
> include
Sam Ravnborg wrote:
>
> I would prefer to have *.gz and *.lzma pushed out to the
> directories where it matters.
> There global ignore rules will bite us one day.
>
> So I did not apply neither this nor Peter's original patch.
>
I think that's the wrong answer, unless we somehow end up with
compressed files in the source. At the moment, a *.gz file in the
source tree is much more likely to be a file in use by the developer.
-hpa
On Sat, 2009-06-27 at 00:21 +0200, Sam Ravnborg wrote:
> On Sun, Jun 21, 2009 at 01:02:27PM +0530, Jaswinder Singh Rajput wrote:
> >
> > On Sat, 2009-06-20 at 13:52 -0700, H. Peter Anvin wrote:
> > > Add *.bz2 and *.cpio to the top-level gitignore file, for consistency
> > > with *.gz and *.lzma which are already there. Remove specific rules
> > > in usr/gitignore, since they are now covered by the global rules.
> > >
> > > Signed-off-by: H. Peter Anvin <[email protected]>
> > > Cc: Sam Ravnborg <[email protected]>
> >
> > It seems this is based on my patch :
> >
> > [PATCH] gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma
> >
> > And you forget to CC me ;-)
> >
> > Are you trying to do this, fill signed-off-by and enjoy :
> >
> > [PATCH] Add *.bz2 and *.cpio to the top-level gitignore file, for consistency
> > with *.gz and *.lzma which are already there. Remove specific rules
> > in other gitignores, since they are now covered by the global rules.
>
> I would prefer to have *.gz and *.lzma pushed out to the
> directories where it matters.
> There global ignore rules will bite us one day.
>
> So I did not apply neither this nor Peter's original patch.
>
Ok and what about :
[PATCH] gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma
Thanks,
--
JSR
Sam Ravnborg wrote:
>
> I would prefer to have *.gz and *.lzma pushed out to the
> directories where it matters.
> There global ignore rules will bite us one day.
>
> So I did not apply neither this nor Peter's original patch.
>
I'll be stronger even... if there *is* a compressed file that should be
added to git, *then* the user should explicitly add an override to
gitignore in the appropriate directory. Because it is clearly the
aberrant situation.
-hpa
On Fri, Jun 26, 2009 at 03:23:37PM -0700, H. Peter Anvin wrote:
> Sam Ravnborg wrote:
> >
> > I would prefer to have *.gz and *.lzma pushed out to the
> > directories where it matters.
> > There global ignore rules will bite us one day.
> >
> > So I did not apply neither this nor Peter's original patch.
> >
>
> I think that's the wrong answer, unless we somehow end up with
> compressed files in the source. At the moment, a *.gz file in the
> source tree is much more likely to be a file in use by the developer.
My concern is that we may decide to carry files in certain formats
in the kernel source.
And I see a tendency to add more and more file extensions to the
top-level .gitignore file.
It is fine as long as this is files that are:
1) either generated in a lot of places
2) or generated in the top-level directory
But files that we generate in a few arch/*/boot/ directories
does not belong in the top-level .gitignore file.
We should keep the ignore rules close to where they apply,
even if this may cause us to add a few more lines
to the relevant .gitignore files.
Sam
On Sat, Jun 27, 2009 at 04:01:28AM +0530, Jaswinder Singh Rajput wrote:
> On Sat, 2009-06-27 at 00:21 +0200, Sam Ravnborg wrote:
> > On Sun, Jun 21, 2009 at 01:02:27PM +0530, Jaswinder Singh Rajput wrote:
> > >
> > > On Sat, 2009-06-20 at 13:52 -0700, H. Peter Anvin wrote:
> > > > Add *.bz2 and *.cpio to the top-level gitignore file, for consistency
> > > > with *.gz and *.lzma which are already there. Remove specific rules
> > > > in usr/gitignore, since they are now covered by the global rules.
> > > >
> > > > Signed-off-by: H. Peter Anvin <[email protected]>
> > > > Cc: Sam Ravnborg <[email protected]>
> > >
> > > It seems this is based on my patch :
> > >
> > > [PATCH] gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma
> > >
> > > And you forget to CC me ;-)
> > >
> > > Are you trying to do this, fill signed-off-by and enjoy :
> > >
> > > [PATCH] Add *.bz2 and *.cpio to the top-level gitignore file, for consistency
> > > with *.gz and *.lzma which are already there. Remove specific rules
> > > in other gitignores, since they are now covered by the global rules.
> >
> > I would prefer to have *.gz and *.lzma pushed out to the
> > directories where it matters.
> > There global ignore rules will bite us one day.
> >
> > So I did not apply neither this nor Peter's original patch.
> >
>
> Ok and what about :
>
> [PATCH] gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma
You are far to trigger happy with your patches.
This is not a quest about getting maximum number of patches
applied.
This is about doing stuff in the right way and Peter had not even
replied when you start to push your patch.
We have been there before and I'm getting tired of your
attitude towards your patch handling.
Sam
On Sat, 2009-06-27 at 00:46 +0200, Sam Ravnborg wrote:
> On Sat, Jun 27, 2009 at 04:01:28AM +0530, Jaswinder Singh Rajput wrote:
> > On Sat, 2009-06-27 at 00:21 +0200, Sam Ravnborg wrote:
> > > On Sun, Jun 21, 2009 at 01:02:27PM +0530, Jaswinder Singh Rajput wrote:
> > > >
> > > > On Sat, 2009-06-20 at 13:52 -0700, H. Peter Anvin wrote:
> > > > > Add *.bz2 and *.cpio to the top-level gitignore file, for consistency
> > > > > with *.gz and *.lzma which are already there. Remove specific rules
> > > > > in usr/gitignore, since they are now covered by the global rules.
> > > > >
> > > > > Signed-off-by: H. Peter Anvin <[email protected]>
> > > > > Cc: Sam Ravnborg <[email protected]>
> > > >
> > > > It seems this is based on my patch :
> > > >
> > > > [PATCH] gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma
> > > >
> > > > And you forget to CC me ;-)
> > > >
> > > > Are you trying to do this, fill signed-off-by and enjoy :
> > > >
> > > > [PATCH] Add *.bz2 and *.cpio to the top-level gitignore file, for consistency
> > > > with *.gz and *.lzma which are already there. Remove specific rules
> > > > in other gitignores, since they are now covered by the global rules.
> > >
> > > I would prefer to have *.gz and *.lzma pushed out to the
> > > directories where it matters.
> > > There global ignore rules will bite us one day.
> > >
> > > So I did not apply neither this nor Peter's original patch.
> > >
> >
> > Ok and what about :
> >
> > [PATCH] gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma
>
> You are far to trigger happy with your patches.
> This is not a quest about getting maximum number of patches
> applied.
> This is about doing stuff in the right way and Peter had not even
> replied when you start to push your patch.
>
> We have been there before and I'm getting tired of your
> attitude towards your patch handling.
>
I am also tired of bz2 file coming up each and every time I prepare
patch. I am curious because I want to get rid of it.
I do not care whether you apply mine or peter or yours. I need solution.
Thanks,
--
JSR
Sam Ravnborg wrote:
>
> My concern is that we may decide to carry files in certain formats
> in the kernel source.
> And I see a tendency to add more and more file extensions to the
> top-level .gitignore file.
>
> It is fine as long as this is files that are:
> 1) either generated in a lot of places
> 2) or generated in the top-level directory
>
> But files that we generate in a few arch/*/boot/ directories
> does not belong in the top-level .gitignore file.
> We should keep the ignore rules close to where they apply,
> even if this may cause us to add a few more lines
> to the relevant .gitignore files.
>
Honestly, I think this is ridiculous. A single well-maintained
.gitignore file is a *service* to the whole tree, and the last thing we
want is git to behave differently in different subdirectories.
It is *much better* to have global rules, and add exceptions out in the
leaves of the tree where they apply. The question that the global
.gitignore should answer is:
"If I have a file of type X, is the user *likely* to want to actually
want it in the tree?"
In the case of *.gz *.bz2 *.lzma or *.cpio, I think the answer is a
resounding "no". Almost every architecture uses compressed files at
some stage of its boot, and it's *always* a generated file. A
non-generated file is probably a patch being handled by a developer, not
something that is meant to be in the tree.
I'm not saying we wouldn't *ever* want to have compressed binary blobs
in the tree -- there are actually a handful of reasons to do so -- but
*those are the exceptions*, and therefore should be using !-rules in
their respective .gitignores, instead of requiring that the entire tree
suffers from less sensible defaults.
-hpa
On Fri, Jun 26, 2009 at 03:51:41PM -0700, H. Peter Anvin wrote:
> Sam Ravnborg wrote:
> >
> > My concern is that we may decide to carry files in certain formats
> > in the kernel source.
> > And I see a tendency to add more and more file extensions to the
> > top-level .gitignore file.
> >
> > It is fine as long as this is files that are:
> > 1) either generated in a lot of places
> > 2) or generated in the top-level directory
> >
> > But files that we generate in a few arch/*/boot/ directories
> > does not belong in the top-level .gitignore file.
> > We should keep the ignore rules close to where they apply,
> > even if this may cause us to add a few more lines
> > to the relevant .gitignore files.
> >
>
> Honestly, I think this is ridiculous. A single well-maintained
> .gitignore file is a *service* to the whole tree, and the last thing we
> want is git to behave differently in different subdirectories.
>
> It is *much better* to have global rules, and add exceptions out in the
> leaves of the tree where they apply. The question that the global
> .gitignore should answer is:
>
> "If I have a file of type X, is the user *likely* to want to actually
> want it in the tree?"
>
> In the case of *.gz *.bz2 *.lzma or *.cpio, I think the answer is a
> resounding "no". Almost every architecture uses compressed files at
> some stage of its boot, and it's *always* a generated file. A
> non-generated file is probably a patch being handled by a developer, not
> something that is meant to be in the tree.
Convinced with respect to the *.gz *.bz2 *.lzma or *.cpio extensions.
But I will continue to be reluctant to adding global entries,
as I have been beated from time to time by something
that was ignored but should not have been so.
Jaswinder - please resend your patch that
add these 4 extensions to the top-level .gitignore
and remove them from .gitignore in the rest of the tree.
Thanks,
Sam
On Sat, 2009-06-27 at 09:47 +0200, Sam Ravnborg wrote:
>
> Convinced with respect to the *.gz *.bz2 *.lzma or *.cpio extensions.
> But I will continue to be reluctant to adding global entries,
> as I have been beated from time to time by something
> that was ignored but should not have been so.
>
> Jaswinder - please resend your patch that
> add these 4 extensions to the top-level .gitignore
> and remove them from .gitignore in the rest of the tree.
>
[PATCH] gitignore: Add *.gz *.bz2 *.lzma and *.cpio extensions to top-level and remove from rest of the tree
Add *.gz, *.bz2, *.lzma and *.cpio extensions to the top-level .gitignore
and remove them from .gitignore in the rest of the tree
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
.gitignore | 2 ++
Documentation/DocBook/.gitignore | 1 -
arch/arm/boot/compressed/.gitignore | 1 -
arch/powerpc/boot/.gitignore | 1 -
kernel/.gitignore | 1 -
usr/.gitignore | 2 --
6 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index cecb3b0..a255340 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,8 @@
*.elf
*.bin
*.gz
+*.bz2
+*.cpio
*.lzma
*.patch
diff --git a/Documentation/DocBook/.gitignore b/Documentation/DocBook/.gitignore
index c6def35..0c91638 100644
--- a/Documentation/DocBook/.gitignore
+++ b/Documentation/DocBook/.gitignore
@@ -2,7 +2,6 @@
*.ps
*.pdf
*.html
-*.9.gz
*.9
*.aux
*.dvi
diff --git a/arch/arm/boot/compressed/.gitignore b/arch/arm/boot/compressed/.gitignore
index ab204db..269b788 100644
--- a/arch/arm/boot/compressed/.gitignore
+++ b/arch/arm/boot/compressed/.gitignore
@@ -1,3 +1,2 @@
font.c
-piggy.gz
vmlinux.lds
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
index 3d80c3e..44fd5b6 100644
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
@@ -16,7 +16,6 @@ inftrees.h
infutil.c
infutil.h
kernel-vmlinux.strip.c
-kernel-vmlinux.strip.gz
mktree
uImage
cuImage.*
diff --git a/kernel/.gitignore b/kernel/.gitignore
index ab4f109..04f6d83 100644
--- a/kernel/.gitignore
+++ b/kernel/.gitignore
@@ -2,5 +2,4 @@
# Generated files
#
config_data.h
-config_data.gz
timeconst.h
diff --git a/usr/.gitignore b/usr/.gitignore
index 69b2e89..4d7d9f4 100644
--- a/usr/.gitignore
+++ b/usr/.gitignore
@@ -2,7 +2,5 @@
# Generated files
#
gen_init_cpio
-initramfs_data.cpio
-initramfs_data.cpio.gz
initramfs_list
include
--
1.6.0.6
Sam Ravnborg wrote:
>
> Convinced with respect to the *.gz *.bz2 *.lzma or *.cpio extensions.
> But I will continue to be reluctant to adding global entries,
> as I have been beated from time to time by something
> that was ignored but should not have been so.
>
In general, in the particular case of the Linux kernel tree, I think
that it's generally safe to add binary file types to the top level: we
have *extremely* few binary files in the tree, and those are clearly
special cases.
Text files or ambiguous types is another matter.
-hpa
--
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel. I don't speak on their behalf.