* [Qemu-devel] [PATCH] ignore patch related files
@ 2011-05-17 21:10 Mike Frysinger
2011-05-17 22:17 ` Peter Maydell
2011-05-18 0:18 ` [Qemu-devel] [PATCH v2] " Mike Frysinger
0 siblings, 2 replies; 4+ messages in thread
From: Mike Frysinger @ 2011-05-17 21:10 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
.gitignore | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index 08013fc..e6557c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,10 @@ QMP/qmp-commands.txt
*.orig
.pc
patches
+*.diff
+*.patch
+*.rej
+*.orig
pc-bios/bios-pq/status
pc-bios/vgabios-pq/status
pc-bios/optionrom/linuxboot.bin
--
1.7.5.rc3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] ignore patch related files
2011-05-17 21:10 [Qemu-devel] [PATCH] ignore patch related files Mike Frysinger
@ 2011-05-17 22:17 ` Peter Maydell
2011-05-18 0:14 ` Mike Frysinger
2011-05-18 0:18 ` [Qemu-devel] [PATCH v2] " Mike Frysinger
1 sibling, 1 reply; 4+ messages in thread
From: Peter Maydell @ 2011-05-17 22:17 UTC (permalink / raw)
To: Mike Frysinger; +Cc: qemu-devel
On 17 May 2011 22:10, Mike Frysinger <vapier@gentoo.org> wrote:
> --- a/.gitignore
> +++ b/.gitignore
> @@ -58,6 +58,10 @@ QMP/qmp-commands.txt
> *.orig
> .pc
> patches
> +*.diff
> +*.patch
> +*.rej
> +*.orig
> pc-bios/bios-pq/status
> pc-bios/vgabios-pq/status
> pc-bios/optionrom/linuxboot.bin
Er, *.orig is already in .gitignore, you can see it in
the context here...
Also I tend to agree with the argument made by Stefan Weil
in the final comment on this patch:
http://patchwork.ozlabs.org/patch/84320/
qemu's .gitignore should contain only entries specific to qemu
(files created by running makefile targets and the like);
generic things like .diff/.patch/.rej should be in your
local git config instead.
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] ignore patch related files
2011-05-17 22:17 ` Peter Maydell
@ 2011-05-18 0:14 ` Mike Frysinger
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2011-05-18 0:14 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel
On Tue, May 17, 2011 at 18:17, Peter Maydell wrote:
> On 17 May 2011 22:10, Mike Frysinger wrote:
>> --- a/.gitignore
>> +++ b/.gitignore
>> @@ -58,6 +58,10 @@ QMP/qmp-commands.txt
>> *.orig
>> .pc
>> patches
>> +*.diff
>> +*.patch
>> +*.rej
>> +*.orig
>> pc-bios/bios-pq/status
>> pc-bios/vgabios-pq/status
>> pc-bios/optionrom/linuxboot.bin
>
> Er, *.orig is already in .gitignore, you can see it in
> the context here...
yes, this patch was written before that .orig entry
> Also I tend to agree with the argument made by Stefan Weil
> in the final comment on this patch:
> http://patchwork.ozlabs.org/patch/84320/
> qemu's .gitignore should contain only entries specific to qemu
> (files created by running makefile targets and the like);
> generic things like .diff/.patch/.rej should be in your
> local git config instead.
using that logic, quite a few entries shouldn't be in .gitignore.
like the "*.orig" you already quoted. and the patch you refer to was
merged.
-mike
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH v2] ignore patch related files
2011-05-17 21:10 [Qemu-devel] [PATCH] ignore patch related files Mike Frysinger
2011-05-17 22:17 ` Peter Maydell
@ 2011-05-18 0:18 ` Mike Frysinger
1 sibling, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2011-05-18 0:18 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
v2
- drop *.orig as it has been merged already
.gitignore | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index 08013fc..790dc12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,9 @@ QMP/qmp-commands.txt
*.orig
.pc
patches
+*.diff
+*.patch
+*.rej
pc-bios/bios-pq/status
pc-bios/vgabios-pq/status
pc-bios/optionrom/linuxboot.bin
--
1.7.5.rc3
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-05-18 0:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-17 21:10 [Qemu-devel] [PATCH] ignore patch related files Mike Frysinger
2011-05-17 22:17 ` Peter Maydell
2011-05-18 0:14 ` Mike Frysinger
2011-05-18 0:18 ` [Qemu-devel] [PATCH v2] " Mike Frysinger
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.