2010-04-21 11:47:23

by Guennadi Liakhovetski

[permalink] [raw]
Subject: [PATCH] kbuild: add *.rej pattern to .gitignore

Tell git to ignore .rej files, generated by patch(1).

Signed-off-by: Guennadi Liakhovetski <[email protected]>
---
diff --git a/.gitignore b/.gitignore
index a2939fc..17ababa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,5 +74,6 @@ GSYMS
GTAGS

*.orig
+*.rej
*~
\#*#


2010-04-21 15:24:43

by Cong Wang

[permalink] [raw]
Subject: Re: [PATCH] kbuild: add *.rej pattern to .gitignore

On Wed, Apr 21, 2010 at 01:47:29PM +0200, Guennadi Liakhovetski wrote:
>Tell git to ignore .rej files, generated by patch(1).
>
>Signed-off-by: Guennadi Liakhovetski <[email protected]>

NACK.

You have to handle *.rej files, not leaving them there.


>---
>diff --git a/.gitignore b/.gitignore
>index a2939fc..17ababa 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -74,5 +74,6 @@ GSYMS
> GTAGS
>
> *.orig
>+*.rej
> *~
> \#*#
>--
>To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>the body of a message to [email protected]
>More majordomo info at http://vger.kernel.org/majordomo-info.html
>Please read the FAQ at http://www.tux.org/lkml/

--
Live like a child, think like the god.

2010-04-21 15:31:20

by Guennadi Liakhovetski

[permalink] [raw]
Subject: Re: [PATCH] kbuild: add *.rej pattern to .gitignore

On Wed, 21 Apr 2010, Américo Wang wrote:

> On Wed, Apr 21, 2010 at 01:47:29PM +0200, Guennadi Liakhovetski wrote:
> >Tell git to ignore .rej files, generated by patch(1).
> >
> >Signed-off-by: Guennadi Liakhovetski <[email protected]>
>
> NACK.
>
> You have to handle *.rej files, not leaving them there.

Hm? I know I have to handle them, and I do handle them, but IMHO it's
entirely valid and up to the user to leave them where they are. You could
apply similar argument to *.orig or to *~ files. In other words, I'm not
convinced.

Thanks
Guennadi

> >---
> >diff --git a/.gitignore b/.gitignore
> >index a2939fc..17ababa 100644
> >--- a/.gitignore
> >+++ b/.gitignore
> >@@ -74,5 +74,6 @@ GSYMS
> > GTAGS
> >
> > *.orig
> >+*.rej
> > *~
> > \#*#

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

2010-04-21 16:29:31

by Cong Wang

[permalink] [raw]
Subject: Re: [PATCH] kbuild: add *.rej pattern to .gitignore

On Wed, Apr 21, 2010 at 05:31:34PM +0200, Guennadi Liakhovetski wrote:
>On Wed, 21 Apr 2010, Américo Wang wrote:
>
>> On Wed, Apr 21, 2010 at 01:47:29PM +0200, Guennadi Liakhovetski wrote:
>> >Tell git to ignore .rej files, generated by patch(1).
>> >
>> >Signed-off-by: Guennadi Liakhovetski <[email protected]>
>>
>> NACK.
>>
>> You have to handle *.rej files, not leaving them there.
>
>Hm? I know I have to handle them, and I do handle them, but IMHO it's
>entirely valid and up to the user to leave them where they are. You could
>apply similar argument to *.orig or to *~ files. In other words, I'm not
>convinced.
>

I am not the only people who is against this, there
was a discussion about this before, please search lkml
archive.

Thanks.

2010-04-21 20:22:19

by Michal Marek

[permalink] [raw]
Subject: Re: [PATCH] kbuild: add *.rej pattern to .gitignore

On 21.4.2010 18:33, Américo Wang wrote:
> On Wed, Apr 21, 2010 at 05:31:34PM +0200, Guennadi Liakhovetski wrote:
>> On Wed, 21 Apr 2010, Américo Wang wrote:
>>> On Wed, Apr 21, 2010 at 01:47:29PM +0200, Guennadi Liakhovetski wrote:
>>>> Tell git to ignore .rej files, generated by patch(1).
>>>>
>>>> Signed-off-by: Guennadi Liakhovetski <[email protected]>
>>> NACK.
>>>
>>> You have to handle *.rej files, not leaving them there.
>> Hm? I know I have to handle them, and I do handle them, but IMHO it's
>> entirely valid and up to the user to leave them where they are. You could
>> apply similar argument to *.orig or to *~ files. In other words, I'm not
>> convinced.
>>
>
> I am not the only people who is against this, there
> was a discussion about this before, please search lkml
> archive.

...and there is no point in starting the flamewar again. If you want to
ignore *.rej files, which is a perfectly valid personal preference, I
suggeest you add the pattern to .git/info/exclude.

hth,
Michal