Patchwork ignore more generated files

login
register
mail settings
Submitter Mike Frysinger
Date Sept. 16, 2012, 8:11 p.m.
Message ID <1347826267-5214-1-git-send-email-vapier@gentoo.org>
Download mbox | patch
Permalink /patch/184149/
State New
Headers show

Comments

Mike Frysinger - Sept. 16, 2012, 8:11 p.m.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 .gitignore |    8 ++++++++
 1 file changed, 8 insertions(+)
Stefan Weil - Sept. 16, 2012, 8:33 p.m.
Am 16.09.2012 22:11, schrieb Mike Frysinger:
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
>   .gitignore |    8 ++++++++
>   1 file changed, 8 insertions(+)
>
> diff --git a/.gitignore b/.gitignore
> index 824c0d2..25c134e 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -11,6 +11,7 @@ trace-dtrace.dtrace
>   *-darwin-user
>   *-linux-user
>   *-bsd-user
> +libcacard/vscclient
>   libdis*
>   libhw32
>   libhw64
> @@ -51,7 +52,11 @@ test-string-output-visitor
>   test-visitor-serialization
>   fsdev/virtfs-proxy-helper.1
>   fsdev/virtfs-proxy-helper.pod
> +a.out*
>   .gdbinit
> +.gdb_history
> +core
> +gmon.out
>   *.a
>   *.aux
>   *.cp
> @@ -79,6 +84,9 @@ fsdev/virtfs-proxy-helper.pod
>   *.orig
>   .pc
>   patches
> +*.diff
> +*.patch
> +*.rej
>   pc-bios/bios-pq/status
>   pc-bios/vgabios-pq/status
>   pc-bios/optionrom/linuxboot.bin

IMHO .gitignore should only contain files which are generated
by a normal QEMU build.

a.out*, .gdb_history, core, *.diff, *patch, *.rej are not QEMU specific
and should be ignored in the user's GIT configuration.

QEMU's .gitignore already contains too many entries which don't
belong there.Maybe it would be a good idea to remove those
entries and add a comment which explains what entries are ok.

Regards

Stefan W.
Mike Frysinger - Sept. 16, 2012, 8:55 p.m.
On Sunday 16 September 2012 16:33:15 Stefan Weil wrote:
> Am 16.09.2012 22:11, schrieb Mike Frysinger:
> > +libcacard/vscclient
> > +a.out*
> > +.gdb_history
> > +core
> > +gmon.out
> > +*.diff
> > +*.patch
> > +*.rej
> 
> IMHO .gitignore should only contain files which are generated
> by a normal QEMU build.
> 
> a.out*, .gdb_history, core, *.diff, *patch, *.rej are not QEMU specific
> and should be ignored in the user's GIT configuration.

these files show up a lot when doing development on qemu, hence i think they do 
make sense to be listed here.  it also makes things "just work" for all users 
rather than requiring every one to set up their local system in the same way.  
plus, that would conflict with repos that do want to merge these types of files 
(uncommon, but not unheard of as test inputs).

it's not like entries in this file "cost" anything at all.
-mike
Stefan Weil - Sept. 17, 2012, 5:31 a.m.
Am 16.09.2012 22:55, schrieb Mike Frysinger:
> On Sunday 16 September 2012 16:33:15 Stefan Weil wrote:
>> Am 16.09.2012 22:11, schrieb Mike Frysinger:
>>> +libcacard/vscclient
>>> +a.out*
>>> +.gdb_history
>>> +core
>>> +gmon.out
>>> +*.diff
>>> +*.patch
>>> +*.rej
>> IMHO .gitignore should only contain files which are generated
>> by a normal QEMU build.
>>
>> a.out*, .gdb_history, core, *.diff, *patch, *.rej are not QEMU specific
>> and should be ignored in the user's GIT configuration.
> these files show up a lot when doing development on qemu, hence i think they do
> make sense to be listed here.  it also makes things "just work" for all users
> rather than requiring every one to set up their local system in the same way.
> plus, that would conflict with repos that do want to merge these types of files
> (uncommon, but not unheard of as test inputs).
>
> it's not like entries in this file "cost" anything at all.
> -mike

Yes, these files show up when doing development, but not only on
QEMU. They are not at all QEMU specific. I assume that most developers
also have other projects which they work on, so IMHO ignoring those
files in their user settings makes more sense.

I personally would prefer to see *.rej files. Your patch ignores
them (which is not what I want). Therefore the claim
that those entries make thinks "just work" for all users is not true:
it's at least all users minus one.

See more in a previous mail on the same subject:
http://lists.gnu.org/archive/html/qemu-devel/2011-02/msg03017.html
(there was also another discussion thread which I did not find
any more).

You can also have a look at other project's .gitignore.
Linux' .gitignore for example looks much better than QEMU's.
It has comments (good!) and only very few entries which are not
generated files.

- Stefan
Jan Kiszka - Sept. 17, 2012, 7:19 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2012-09-16 22:55, Mike Frysinger wrote:
> On Sunday 16 September 2012 16:33:15 Stefan Weil wrote:
>> Am 16.09.2012 22:11, schrieb Mike Frysinger:
>>> +libcacard/vscclient +a.out* +.gdb_history +core +gmon.out 
>>> +*.diff +*.patch +*.rej
>> 
>> IMHO .gitignore should only contain files which are generated by 
>> a normal QEMU build.
>> 
>> a.out*, .gdb_history, core, *.diff, *patch, *.rej are not QEMU 
>> specific and should be ignored in the user's GIT configuration.
> 
> these files show up a lot when doing development on qemu, hence i 
> think they do make sense to be listed here.  it also makes things 
> "just work" for all users rather than requiring every one to set
> up their local system in the same way. plus, that would conflict
> with repos that do want to merge these types of files (uncommon,
> but not unheard of as test inputs).
> 
> it's not like entries in this file "cost" anything at all.

NAK. I'd like to see what is polluting my repositories, not ignoring
it because that's the policy of someone else. Excluding *.rej is
something I would _never_ do. If they lie around somewhere, something
was not merged here - that's my policy.

You are free to set your own core.excludefile. So please do not spread
this to generic .gitignores.

Jan

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iEYEARECAAYFAlBWzxoACgkQitSsb3rl5xQk5ACgoRORiSgWkWlhkz4YdE2zQ1ZB
moUAoK8D5khm+Tz9QrcvKoAhpHOmz5pA
=FgFo
-----END PGP SIGNATURE-----
Eric Blake - Sept. 17, 2012, 2:48 p.m.
On 09/16/2012 11:31 PM, Stefan Weil wrote:
> Yes, these files show up when doing development, but not only on
> QEMU. They are not at all QEMU specific. I assume that most developers
> also have other projects which they work on, so IMHO ignoring those
> files in their user settings makes more sense.
> 
> I personally would prefer to see *.rej files. Your patch ignores
> them (which is not what I want). Therefore the claim
> that those entries make thinks "just work" for all users is not true:
> it's at least all users minus one.

It is also possible to set up your own .git/info/exclude to override
.gitignore and explicitly show *.rej files, even when that is different
from the project default.
Mike Frysinger - Sept. 17, 2012, 6:32 p.m.
On Monday 17 September 2012 03:19:54 Jan Kiszka wrote:
> On 2012-09-16 22:55, Mike Frysinger wrote:
> > On Sunday 16 September 2012 16:33:15 Stefan Weil wrote:
> >> Am 16.09.2012 22:11, schrieb Mike Frysinger:
> >>> +libcacard/vscclient +a.out* +.gdb_history +core +gmon.out
> >>> +*.diff +*.patch +*.rej
> >> 
> >> IMHO .gitignore should only contain files which are generated by
> >> a normal QEMU build.
> >> 
> >> a.out*, .gdb_history, core, *.diff, *patch, *.rej are not QEMU
> >> specific and should be ignored in the user's GIT configuration.
> > 
> > these files show up a lot when doing development on qemu, hence i
> > think they do make sense to be listed here.  it also makes things
> > "just work" for all users rather than requiring every one to set
> > up their local system in the same way. plus, that would conflict
> > with repos that do want to merge these types of files (uncommon,
> > but not unheard of as test inputs).
> > 
> > it's not like entries in this file "cost" anything at all.
> 
> NAK. I'd like to see what is polluting my repositories, not ignoring
> it because that's the policy of someone else. Excluding *.rej is
> something I would _never_ do. If they lie around somewhere, something
> was not merged here - that's my policy.

if something wasn't merged, your git command would have told you and spit an 
error.  same with patch.  if .rej files are showing up and you're not noticing 
at the time of patch application, it's because you're using the tools wrong.
-mike
Jan Kiszka - Sept. 17, 2012, 6:37 p.m.
On 2012-09-17 20:32, Mike Frysinger wrote:
> On Monday 17 September 2012 03:19:54 Jan Kiszka wrote:
>> On 2012-09-16 22:55, Mike Frysinger wrote:
>>> On Sunday 16 September 2012 16:33:15 Stefan Weil wrote:
>>>> Am 16.09.2012 22:11, schrieb Mike Frysinger:
>>>>> +libcacard/vscclient +a.out* +.gdb_history +core +gmon.out
>>>>> +*.diff +*.patch +*.rej
>>>>
>>>> IMHO .gitignore should only contain files which are generated by
>>>> a normal QEMU build.
>>>>
>>>> a.out*, .gdb_history, core, *.diff, *patch, *.rej are not QEMU
>>>> specific and should be ignored in the user's GIT configuration.
>>>
>>> these files show up a lot when doing development on qemu, hence i
>>> think they do make sense to be listed here.  it also makes things
>>> "just work" for all users rather than requiring every one to set
>>> up their local system in the same way. plus, that would conflict
>>> with repos that do want to merge these types of files (uncommon,
>>> but not unheard of as test inputs).
>>>
>>> it's not like entries in this file "cost" anything at all.
>>
>> NAK. I'd like to see what is polluting my repositories, not ignoring
>> it because that's the policy of someone else. Excluding *.rej is
>> something I would _never_ do. If they lie around somewhere, something
>> was not merged here - that's my policy.
> 
> if something wasn't merged, your git command would have told you and spit an 
> error.  same with patch.  if .rej files are showing up and you're not noticing 
> at the time of patch application, it's because you're using the tools wrong.

Whichever tool I use and how need not be your worry - nor should it be
harmed by a generic .gitignore.

Jan

Patch

diff --git a/.gitignore b/.gitignore
index 824c0d2..25c134e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@  trace-dtrace.dtrace
 *-darwin-user
 *-linux-user
 *-bsd-user
+libcacard/vscclient
 libdis*
 libhw32
 libhw64
@@ -51,7 +52,11 @@  test-string-output-visitor
 test-visitor-serialization
 fsdev/virtfs-proxy-helper.1
 fsdev/virtfs-proxy-helper.pod
+a.out*
 .gdbinit
+.gdb_history
+core
+gmon.out
 *.a
 *.aux
 *.cp
@@ -79,6 +84,9 @@  fsdev/virtfs-proxy-helper.pod
 *.orig
 .pc
 patches
+*.diff
+*.patch
+*.rej
 pc-bios/bios-pq/status
 pc-bios/vgabios-pq/status
 pc-bios/optionrom/linuxboot.bin