From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:51074)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <vapier.adi@gmail.com>) id 1QMUPa-0000w4-Ea
	for qemu-devel@nongnu.org; Tue, 17 May 2011 20:14:51 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <vapier.adi@gmail.com>) id 1QMUPZ-00080G-9X
	for qemu-devel@nongnu.org; Tue, 17 May 2011 20:14:50 -0400
Received: from mail-fx0-f45.google.com ([209.85.161.45]:46323)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <vapier.adi@gmail.com>) id 1QMUPZ-00080C-2J
	for qemu-devel@nongnu.org; Tue, 17 May 2011 20:14:49 -0400
Received: by fxm2 with SMTP id 2so969996fxm.4
	for <qemu-devel@nongnu.org>; Tue, 17 May 2011 17:14:47 -0700 (PDT)
MIME-Version: 1.0
Sender: vapier.adi@gmail.com
In-Reply-To: <BANLkTimoiE_s3C+7rNf_d-oQMZ5D42E0YQ@mail.gmail.com>
References: <1305666625-503-1-git-send-email-vapier@gentoo.org>
	<BANLkTimoiE_s3C+7rNf_d-oQMZ5D42E0YQ@mail.gmail.com>
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 17 May 2011 20:14:25 -0400
Message-ID: <BANLkTinn3_yNU_aGiB4J5VGf8mOsnzr=zw@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH] ignore patch related files
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-devel@nongnu.org

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
>> =C2=A0*.orig
>> =C2=A0.pc
>> =C2=A0patches
>> +*.diff
>> +*.patch
>> +*.rej
>> +*.orig
>> =C2=A0pc-bios/bios-pq/status
>> =C2=A0pc-bios/vgabios-pq/status
>> =C2=A0pc-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